QEMU_CAPS_VIRTIO_SCSI_PCI implies that virtio-scsi is only supported
for the PCI bus, which is not the case. Remove the _PCI suffix.
Signed-off-by: Viktor Mihajlovski mihaj...@linux.vnet.ibm.com
---
V3 Changes
- Rename only the enum symbol, not the string reptresentation
src/qemu/qemu_capabilities.c |2 +-
src/qemu/qemu_capabilities.h |2 +-
src/qemu/qemu_command.c |2 +-
tests/qemuhelptest.c |6 +++---
tests/qemuxml2argvtest.c | 12 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 79cfdb3..5945a63 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1322,7 +1322,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ virtio-blk-ccw, QEMU_CAPS_VIRTIO_CCW },
{ sclpconsole, QEMU_CAPS_SCLP_S390 },
{ lsi53c895a, QEMU_CAPS_SCSI_LSI },
-{ virtio-scsi-pci, QEMU_CAPS_VIRTIO_SCSI_PCI },
+{ virtio-scsi-pci, QEMU_CAPS_VIRTIO_SCSI },
{ spicevmc, QEMU_CAPS_DEVICE_SPICEVMC },
{ qxl-vga, QEMU_CAPS_DEVICE_QXL_VGA },
{ qxl, QEMU_CAPS_DEVICE_QXL },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5c5dc5a..da06e27 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -139,7 +139,7 @@ enum virQEMUCapsFlags {
QEMU_CAPS_BALLOON_EVENT = 99, /* Async event for balloon changes */
QEMU_CAPS_NETDEV_BRIDGE = 100, /* bridge helper support */
QEMU_CAPS_SCSI_LSI = 101, /* -device lsi */
-QEMU_CAPS_VIRTIO_SCSI_PCI= 102, /* -device virtio-scsi-pci */
+QEMU_CAPS_VIRTIO_SCSI= 102, /* -device virtio-scsi-* */
QEMU_CAPS_BLOCKIO= 103, /* -device ...logical_block_size co
*/
QEMU_CAPS_DISABLE_S3 = 104, /* S3 BIOS Advertisement on/off */
QEMU_CAPS_DISABLE_S4 = 105, /* S4 BIOS Advertisement on/off */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e7f2325..d15f719 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -505,7 +505,7 @@ qemuSetScsiControllerModel(virDomainDefPtr def,
}
break;
case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI:
-if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI_PCI)) {
+if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_SCSI)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, %s,
_(This QEMU doesn't support
virtio scsi controller));
diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 720a188..842cdc9 100644
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -803,7 +803,7 @@ mymain(void)
QEMU_CAPS_NEC_USB_XHCI,
QEMU_CAPS_NETDEV_BRIDGE,
QEMU_CAPS_SCSI_LSI,
-QEMU_CAPS_VIRTIO_SCSI_PCI,
+QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_BLOCKIO,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_QXL,
@@ -892,7 +892,7 @@ mymain(void)
QEMU_CAPS_NEC_USB_XHCI,
QEMU_CAPS_NETDEV_BRIDGE,
QEMU_CAPS_SCSI_LSI,
-QEMU_CAPS_VIRTIO_SCSI_PCI,
+QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_BLOCKIO,
QEMU_CAPS_DISABLE_S3,
QEMU_CAPS_DISABLE_S4,
@@ -996,7 +996,7 @@ mymain(void)
QEMU_CAPS_NEC_USB_XHCI,
QEMU_CAPS_NETDEV_BRIDGE,
QEMU_CAPS_SCSI_LSI,
-QEMU_CAPS_VIRTIO_SCSI_PCI,
+QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_BLOCKIO,
QEMU_CAPS_DISABLE_S3,
QEMU_CAPS_DISABLE_S4,
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a9a5557..baf7a4f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -514,24 +514,24 @@ mymain(void)
QEMU_CAPS_SCSI_LSI);
DO_TEST(disk-scsi-disk-split,
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
-QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI);
+QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI);
DO_TEST(disk-scsi-disk-wwn,
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
-QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI,
+QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_DISK_WWN);
DO_TEST(disk-scsi-disk-vpd,
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
-QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI,
+QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_SCSI_DISK_WWN);
DO_TEST_FAILURE(disk-scsi-disk-vpd-build-error,
QEMU_CAPS_DRIVE, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG,
-QEMU_CAPS_SCSI_CD, QEMU_CAPS_SCSI_LSI, QEMU_CAPS_VIRTIO_SCSI_PCI,
+
