summary refs log tree commit diff stats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/acpi-test-data/pc/DSDTbin3028 -> 5478 bytes
-rw-r--r--tests/acpi-test-data/pc/DSDT.bridge (renamed from tests/acpi-test-data/pc/SSDT.bridge)bin4345 -> 7337 bytes
-rw-r--r--tests/acpi-test-data/pc/SSDTbin2486 -> 0 bytes
-rw-r--r--tests/acpi-test-data/q35/DSDTbin7666 -> 8321 bytes
-rw-r--r--tests/acpi-test-data/q35/DSDT.bridgebin0 -> 8338 bytes
-rw-r--r--tests/acpi-test-data/q35/SSDTbin691 -> 0 bytes
-rw-r--r--tests/acpi-test-data/q35/SSDT.bridgebin708 -> 0 bytes
-rw-r--r--tests/vhost-user-test.c5
8 files changed, 2 insertions, 3 deletions
diff --git a/tests/acpi-test-data/pc/DSDT b/tests/acpi-test-data/pc/DSDT
index c658203db9..ec0e642b06 100644
--- a/tests/acpi-test-data/pc/DSDT
+++ b/tests/acpi-test-data/pc/DSDT
Binary files differdiff --git a/tests/acpi-test-data/pc/SSDT.bridge b/tests/acpi-test-data/pc/DSDT.bridge
index 6e6660b1fb..7b1c14b529 100644
--- a/tests/acpi-test-data/pc/SSDT.bridge
+++ b/tests/acpi-test-data/pc/DSDT.bridge
Binary files differdiff --git a/tests/acpi-test-data/pc/SSDT b/tests/acpi-test-data/pc/SSDT
deleted file mode 100644
index 210d6a71e5..0000000000
--- a/tests/acpi-test-data/pc/SSDT
+++ /dev/null
Binary files differdiff --git a/tests/acpi-test-data/q35/DSDT b/tests/acpi-test-data/q35/DSDT
index 4723e5954d..b492f04b88 100644
--- a/tests/acpi-test-data/q35/DSDT
+++ b/tests/acpi-test-data/q35/DSDT
Binary files differdiff --git a/tests/acpi-test-data/q35/DSDT.bridge b/tests/acpi-test-data/q35/DSDT.bridge
new file mode 100644
index 0000000000..3b72e250fa
--- /dev/null
+++ b/tests/acpi-test-data/q35/DSDT.bridge
Binary files differdiff --git a/tests/acpi-test-data/q35/SSDT b/tests/acpi-test-data/q35/SSDT
deleted file mode 100644
index 0970c67ddb..0000000000
--- a/tests/acpi-test-data/q35/SSDT
+++ /dev/null
Binary files differdiff --git a/tests/acpi-test-data/q35/SSDT.bridge b/tests/acpi-test-data/q35/SSDT.bridge
deleted file mode 100644
index a778688617..0000000000
--- a/tests/acpi-test-data/q35/SSDT.bridge
+++ /dev/null
Binary files differdiff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 95f35af3e5..e30b7f4abc 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