7:45 a.m.
Before removal of QEMU_CAPS_DEVICE, its only usage was
or'd with QEMU_CAPS_DEVICE.
Now it's unused.
---
src/qemu/qemu_capabilities.c | 2 --
src/qemu/qemu_capabilities.h | 2 +-
tests/qemuhelptest.c | 5 -----
tests/qemuxml2argvtest.c | 32 ++++++++++++++------------------
4 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 509b7ed..d32e71f 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1158,8 +1158,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_BOOT);
if (strstr(help, "serial=s"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL);
- if (strstr(help, "-pcidevice"))
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCIDEVICE);
if (strstr(help, "host=[seg:]bus"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
if (strstr(help, "-mem-path"))
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 1ee0646..368996a 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -69,7 +69,7 @@ typedef enum {
/* 15 */
X_QEMU_CAPS_VGA, /* Is -vga avail */
X_QEMU_CAPS_0_10, /* features added in qemu-0.10.0 or later */
- QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */
+ X_QEMU_CAPS_PCIDEVICE, /* PCI device assignment supported */
QEMU_CAPS_MEM_PATH, /* mmap'ped guest backing supported */
QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index d430fda..e159b6e 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -169,7 +169,6 @@ mymain(void)
QEMU_CAPS_DRIVE_BOOT,
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
- QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
@@ -212,7 +211,6 @@ mymain(void)
QEMU_CAPS_DRIVE_BOOT,
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
- QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
QEMU_CAPS_SDL,
QEMU_CAPS_CHARDEV,
@@ -236,7 +234,6 @@ mymain(void)
QEMU_CAPS_DRIVE_CACHE_UNSAFE,
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
- QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
QEMU_CAPS_SDL,
QEMU_CAPS_CHARDEV,
@@ -289,7 +286,6 @@ mymain(void)
QEMU_CAPS_DRIVE_CACHE_UNSAFE,
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
- QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
@@ -339,7 +335,6 @@ mymain(void)
QEMU_CAPS_DRIVE_CACHE_UNSAFE,
QEMU_CAPS_KVM,
QEMU_CAPS_DRIVE_SERIAL,
- QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_MEM_PATH,
QEMU_CAPS_CHARDEV,
QEMU_CAPS_ENABLE_KVM,
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f73c085..a2318ef 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -675,7 +675,7 @@ mymain(void)
DO_TEST("cpu-eoi-disabled", QEMU_CAPS_ENABLE_KVM);
DO_TEST("cpu-eoi-enabled", QEMU_CAPS_ENABLE_KVM);
- DO_TEST("controller-order", QEMU_CAPS_PCIDEVICE,
+ DO_TEST("controller-order",
QEMU_CAPS_KVM, QEMU_CAPS_ENABLE_KVM,
QEMU_CAPS_BOOT_MENU, QEMU_CAPS_PIIX3_USB_UHCI,
QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_DRIVE_AIO,
@@ -995,21 +995,19 @@ mymain(void)
DO_TEST("net-mcast", NONE);
DO_TEST("net-udp", NONE);
DO_TEST("net-hostdev",
- QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG);
+ QEMU_CAPS_NODEFCONFIG);
DO_TEST("net-hostdev-multidomain",
- QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
DO_TEST_FAILURE("net-hostdev-multidomain",
- QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_NODEFCONFIG);
DO_TEST("net-hostdev-vfio",
- QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("net-hostdev-vfio-multidomain",
- QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
DO_TEST_FAILURE("net-hostdev-vfio-multidomain",
- QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("serial-vc", NONE);
@@ -1241,20 +1239,19 @@ mymain(void)
DO_TEST("hostdev-usb-address-device-boot",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_BOOTINDEX,
QEMU_CAPS_USB_HOST_BOOTINDEX);
- DO_TEST("hostdev-pci-address", QEMU_CAPS_PCIDEVICE);
+ DO_TEST("hostdev-pci-address", NONE);
DO_TEST("hostdev-pci-address-device",
- QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG);
+ QEMU_CAPS_NODEFCONFIG);
DO_TEST("hostdev-vfio",
- QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("hostdev-vfio-multidomain",
- QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG,
+ QEMU_CAPS_NODEFCONFIG,
QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_HOST_PCI_MULTIDOMAIN);
DO_TEST_FAILURE("hostdev-vfio-multidomain",
- QEMU_CAPS_PCIDEVICE,
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VFIO_PCI);
DO_TEST("pci-rom",
- QEMU_CAPS_PCIDEVICE, QEMU_CAPS_NODEFCONFIG);
+ QEMU_CAPS_NODEFCONFIG);
DO_TEST_FULL("restore-v2", "exec:cat", 7, 0, 0, GIC_NONE, NONE);
DO_TEST_FULL("restore-v2-fd", "stdio", 7, 0, 0, GIC_NONE, NONE);
@@ -1842,14 +1839,13 @@ mymain(void)
DO_TEST("fips-enabled", QEMU_CAPS_ENABLE_FIPS);
- DO_TEST("shmem", QEMU_CAPS_PCIDEVICE,
- QEMU_CAPS_DEVICE_IVSHMEM);
+ DO_TEST("shmem", QEMU_CAPS_DEVICE_IVSHMEM);
DO_TEST_FAILURE("shmem", NONE);
- DO_TEST_FAILURE("shmem-invalid-size", QEMU_CAPS_PCIDEVICE,
+ DO_TEST_FAILURE("shmem-invalid-size",
QEMU_CAPS_DEVICE_IVSHMEM);
- DO_TEST_FAILURE("shmem-invalid-address", QEMU_CAPS_PCIDEVICE,
+ DO_TEST_FAILURE("shmem-invalid-address",
QEMU_CAPS_DEVICE_IVSHMEM);
- DO_TEST_FAILURE("shmem-small-size", QEMU_CAPS_PCIDEVICE,
+ DO_TEST_FAILURE("shmem-small-size",
QEMU_CAPS_DEVICE_IVSHMEM);
DO_TEST_PARSE_ERROR("shmem-msi-only", NONE);
DO_TEST("cpu-host-passthrough-features", QEMU_CAPS_KVM);
--
2.7.3