From caf50c7166a6ed96c462ab5db4b495e1234e4cc6 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Fri, 22 Jan 2016 15:36:07 +0100 Subject: tests: pc: acpi: drop not needed 'expected SSDT' blobs Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/acpi-test-data/pc/SSDT | Bin 2486 -> 0 bytes tests/acpi-test-data/pc/SSDT.bridge | Bin 4345 -> 0 bytes tests/acpi-test-data/q35/SSDT | Bin 691 -> 0 bytes tests/acpi-test-data/q35/SSDT.bridge | Bin 708 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 tests/acpi-test-data/pc/SSDT delete mode 100644 tests/acpi-test-data/pc/SSDT.bridge delete mode 100644 tests/acpi-test-data/q35/SSDT delete mode 100644 tests/acpi-test-data/q35/SSDT.bridge (limited to 'tests') diff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT deleted file mode 100644 index 210d6a7..0000000 Binary files a/tests/acpi-test-data/pc/SSDT and /dev/null differ diff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/SSDT.bridge deleted file mode 100644 index 6e6660b..0000000 Binary files a/tests/acpi-test-data/pc/SSDT.bridge and /dev/null differ diff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT deleted file mode 100644 index 0970c67..0000000 Binary files a/tests/acpi-test-data/q35/SSDT and /dev/null differ diff --git a/tests/acpi-test-data/q35/SSDT.bridge b/tests/acpi-test-data/q35/SSDT.bridge deleted file mode 100644 index a778688..0000000 Binary files a/tests/acpi-test-data/q35/SSDT.bridge and /dev/null differ -- cgit v1.1 From 0734fb083cb0a91d17d355acdea16a3413b69b0c Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Fri, 22 Jan 2016 15:36:08 +0100 Subject: tests: pc: acpi: add expected DSDT.bridge blobs and update DSDT blobs Signed-off-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/acpi-test-data/pc/DSDT | Bin 3028 -> 5478 bytes tests/acpi-test-data/pc/DSDT.bridge | Bin 0 -> 7337 bytes tests/acpi-test-data/q35/DSDT | Bin 7666 -> 8321 bytes tests/acpi-test-data/q35/DSDT.bridge | Bin 0 -> 8338 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/acpi-test-data/pc/DSDT.bridge create mode 100644 tests/acpi-test-data/q35/DSDT.bridge (limited to 'tests') diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT index c658203..ec0e642 100644 Binary files a/tests/acpi-test-data/pc/DSDT and b/tests/acpi-test-data/pc/DSDT differ diff --git a/tests/acpi-test-data/pc/DSDT.bridge b/tests/acpi-test-data/pc/DSDT.bridge new file mode 100644 index 0000000..7b1c14b Binary files /dev/null and b/tests/acpi-test-data/pc/DSDT.bridge differ diff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT index 4723e59..b492f04 100644 Binary files a/tests/acpi-test-data/q35/DSDT and b/tests/acpi-test-data/q35/DSDT differ diff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge new file mode 100644 index 0000000..3b72e25 Binary files /dev/null and b/tests/acpi-test-data/q35/DSDT.bridge differ -- cgit v1.1 From b5c6eaf173cbeec414b2d837c5703515f979f2af Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 4 Feb 2016 16:00:52 +0100 Subject: vhost-user-test: use correct ROM to speed up and avoid spurious failures The mechanism to get the option ROM for virtio-net does not block the PCI ROM from being loaded. Therefore, in vhost-user-test there are two entries in the boot menu for the virtio-net card: one as an embedded option ROM, one from the ROM BAR. The embedded option ROM in vhost-user-test is the non-EFI-enabled, while the ROM BAR has an EFI-enabled ROM. The two are compiled with slightly different parameters, where only the old BIOS-only one doesn't have a timeout for the "Press Ctrl-B" banner. When using a new machine type, therefore, the vhost-user-test has to wait for the EFI-enabled ROM's banner to go away. There are several ways to fix this: 1) fix the ROMs to have the same configuration 2) add ",romfile=" to the -device line 3) remove --option-rom and add the ROM file name to the -device line 4) use an old machine type This patch chooses 3. In addition, the file name was wrong because qtest runs QEMU relative to the top build directory, not to the x86_64-softmmu/ subdirectory, which is fixed too. Signed-off-by: Paolo Bonzini Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/vhost-user-test.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 95f35af..e30b7f4 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -35,11 +35,10 @@ "mem-path=%s,share=on -numa node,memdev=mem" #define QEMU_CMD_CHR " -chardev socket,id=%s,path=%s" #define QEMU_CMD_NETDEV " -netdev vhost-user,id=net0,chardev=%s,vhostforce" -#define QEMU_CMD_NET " -device virtio-net-pci,netdev=net0 " -#define QEMU_CMD_ROM " -option-rom ../pc-bios/pxe-virtio.rom" +#define QEMU_CMD_NET " -device virtio-net-pci,netdev=net0,romfile=./pc-bios/pxe-virtio.rom" #define QEMU_CMD QEMU_CMD_ACCEL QEMU_CMD_MEM QEMU_CMD_CHR \ - QEMU_CMD_NETDEV QEMU_CMD_NET QEMU_CMD_ROM + QEMU_CMD_NETDEV QEMU_CMD_NET #define HUGETLBFS_MAGIC 0x958458f6 -- cgit v1.1