diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-02 09:49:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-02 09:49:02 +0100 |
| commit | d3d183a638d6a3ead515618a6547b3f80d39fcb9 (patch) | |
| tree | 1321968e685e92cc2a0ba4bbb6032d93b9972658 /tests | |
| parent | 82d3d409b8b650164817ead0cb48298c6973d731 (diff) | |
| parent | 3a3fcc75f92ab0d71ba0e7511af7dc575c4b4f6c (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, acpi, virtio: fixes, test speedup for rc1
Some fixes all over the place. Notably vhost-user gained a new message
to set endian-ness. Borderline for 2.10 but seems to be the only way to
fix legacy guests. Also pc tests are run on kvm now. Not a fix at all
but doesn't touch qemu itself, so I merged it since I had to run these a
lot and I just got tired of waiting for these to finish.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Tue 01 Aug 2017 22:36:47 BST
# gpg: using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>"
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
pc: acpi: force FADT rev1 for 440fx based machine types
pc: make 'pc.rom' readonly when machine has PCI enabled
vhost-user: fix watcher need be removed when vhost-user hotplug
tests/bios-tables-test: Compiler warning fix
accel: cleanup error output
intel_iommu: use access_flags for iotlb
intel_iommu: fix iova for pt
vhost-user: fix legacy cross-endian configurations
vhost: fix a memory leak
tests: switch pxe and vm gen id tests to use kvm
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bios-tables-test.c | 2 | ||||
| -rw-r--r-- | tests/pxe-test.c | 2 | ||||
| -rw-r--r-- | tests/vmgenid-test.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index 63da978f0b..564da45f65 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -108,7 +108,7 @@ static void test_acpi_rsdt_table(test_data *data) /* compute the table entries in rsdt */ tables_nr = (rsdt_table->length - sizeof(AcpiRsdtDescriptorRev1)) / sizeof(uint32_t); - g_assert_cmpint(tables_nr, >, 0); + g_assert(tables_nr > 0); /* get the addresses of the tables pointed by rsdt */ tables = g_new0(uint32_t, tables_nr); diff --git a/tests/pxe-test.c b/tests/pxe-test.c index 34282d3704..cf6e225330 100644 --- a/tests/pxe-test.c +++ b/tests/pxe-test.c @@ -25,7 +25,7 @@ static void test_pxe_one(const char *params, bool ipv6) { char *args; - args = g_strdup_printf("-machine accel=tcg -nodefaults -boot order=n " + args = g_strdup_printf("-machine accel=kvm:tcg -nodefaults -boot order=n " "-netdev user,id=" NETNAME ",tftp=./,bootfile=%s," "ipv4=%s,ipv6=%s %s", disk, ipv6 ? "off" : "on", ipv6 ? "on" : "off", params); diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c index a49de9233b..3d5c1c3615 100644 --- a/tests/vmgenid-test.c +++ b/tests/vmgenid-test.c @@ -132,7 +132,7 @@ static char disk[] = "tests/vmgenid-test-disk-XXXXXX"; static char *guid_cmd_strdup(const char *guid) { - return g_strdup_printf("-machine accel=tcg " + return g_strdup_printf("-machine accel=kvm:tcg " "-device vmgenid,id=testvgid,guid=%s " "-drive id=hd0,if=none,file=%s,format=raw " "-device ide-hd,drive=hd0 ", |