[libvirt] [PATCH 2/2] qemu: Drop QEMU_CAPS_DEVICE_SCSI_GENERIC
Andrea Bolognani
abologna at redhat.com
Tue Sep 18 10:46:12 UTC 2018
It was already available in 1.5.0, so we can assume it's
present and avoid checking for it at runtime.
This commit is best viewed with 'git show -w'.
Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
src/qemu/qemu_capabilities.c | 7 +--
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 61 ++++++++-----------
src/qemu/qemu_hotplug.c | 12 ----
.../caps_1.5.3.x86_64.xml | 1 -
.../caps_1.6.0.x86_64.xml | 1 -
.../caps_1.7.0.x86_64.xml | 1 -
.../caps_2.1.1.x86_64.xml | 1 -
.../caps_2.10.0.aarch64.xml | 1 -
.../caps_2.10.0.ppc64.xml | 1 -
.../caps_2.10.0.s390x.xml | 1 -
.../caps_2.10.0.x86_64.xml | 1 -
.../caps_2.11.0.s390x.xml | 1 -
.../caps_2.11.0.x86_64.xml | 1 -
.../caps_2.12.0.aarch64.xml | 1 -
.../caps_2.12.0.ppc64.xml | 1 -
.../caps_2.12.0.s390x.xml | 1 -
.../caps_2.12.0.x86_64.xml | 1 -
.../caps_2.4.0.x86_64.xml | 1 -
.../caps_2.5.0.x86_64.xml | 1 -
.../caps_2.6.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
.../caps_2.6.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 -
.../caps_2.7.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 -
.../caps_2.8.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 -
.../caps_2.9.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 -
.../caps_3.0.0.riscv32.xml | 1 -
.../caps_3.0.0.riscv64.xml | 1 -
.../caps_3.0.0.x86_64.xml | 1 -
tests/qemuxml2argvtest.c | 53 ++++++++--------
tests/qemuxml2xmltest.c | 55 ++++++++---------
36 files changed, 79 insertions(+), 141 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 04c2adcfb5..75c35112a3 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1078,7 +1078,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "spapr-nvram", QEMU_CAPS_DEVICE_NVRAM },
{ "pci-bridge", QEMU_CAPS_DEVICE_PCI_BRIDGE },
{ "vfio-pci", QEMU_CAPS_DEVICE_VFIO_PCI },
- { "scsi-generic", QEMU_CAPS_DEVICE_SCSI_GENERIC },
{ "i82801b11-bridge", QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE },
{ "usb-storage", QEMU_CAPS_DEVICE_USB_STORAGE },
{ "virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO },
@@ -5189,10 +5188,8 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps,
VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType,
VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB,
- VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI);
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC))
- VIR_DOMAIN_CAPS_ENUM_SET(hostdev->subsysType,
- VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI);
+ VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI,
+ VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI);
/* No virDomainHostdevCapsType for QEMU */
virDomainCapsEnumClear(&hostdev->capsType);
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index e671f74ebb..a88c1aff22 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -248,7 +248,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DEVICE_PCI_BRIDGE, /* -device pci-bridge */
QEMU_CAPS_DEVICE_VFIO_PCI, /* -device vfio-pci */
X_QEMU_CAPS_VFIO_PCI_BOOTINDEX, /* bootindex param for vfio-pci device */
- QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */
+ X_QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */
/* 145 */
X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0a353f87ba..887947dc11 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5384,51 +5384,38 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
/* SCSI */
if (virHostdevIsSCSIDevice(hostdev)) {
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC)) {
- virDomainHostdevSubsysSCSIPtr scsisrc =
- &hostdev->source.subsys.u.scsi;
- char *drvstr;
-
- if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
- virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =
- &scsisrc->u.iscsi;
- qemuDomainStorageSourcePrivatePtr srcPriv =
- QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src);
-
- if (qemuBuildDiskSecinfoCommandLine(cmd, srcPriv ?
- srcPriv->secinfo :
- NULL) < 0)
- return -1;
- }
-
- virCommandAddArg(cmd, "-drive");
- if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps)))
+ virDomainHostdevSubsysSCSIPtr scsisrc =
+ &hostdev->source.subsys.u.scsi;
+ char *drvstr;
+
+ if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
+ virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc =
+ &scsisrc->u.iscsi;
+ qemuDomainStorageSourcePrivatePtr srcPriv =
+ QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(iscsisrc->src);
+
+ if (qemuBuildDiskSecinfoCommandLine(cmd, srcPriv ?
+ srcPriv->secinfo :
+ NULL) < 0)
return -1;
- virCommandAddArg(cmd, drvstr);
- VIR_FREE(drvstr);
+ }
- virCommandAddArg(cmd, "-device");
- if (!(devstr = qemuBuildSCSIHostdevDevStr(def, hostdev)))
- return -1;
- virCommandAddArg(cmd, devstr);
- VIR_FREE(devstr);
- } else {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("SCSI passthrough is not supported by this version of qemu"));
+ virCommandAddArg(cmd, "-drive");
+ if (!(drvstr = qemuBuildSCSIHostdevDrvStr(hostdev, qemuCaps)))
return -1;
- }
+ virCommandAddArg(cmd, drvstr);
+ VIR_FREE(drvstr);
+
+ virCommandAddArg(cmd, "-device");
+ if (!(devstr = qemuBuildSCSIHostdevDevStr(def, hostdev)))
+ return -1;
+ virCommandAddArg(cmd, devstr);
+ VIR_FREE(devstr);
}
/* SCSI_host */
if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST) {
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("SCSI passthrough is not supported by this "
- "version of qemu"));
- return -1;
- }
-
if (hostdev->source.subsys.u.scsi_host.protocol ==
VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_VHOST) {
char *vhostfdName = NULL;
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 633e7fc18f..0bbea80120 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2614,12 +2614,6 @@ qemuDomainAttachHostSCSIDevice(virQEMUDriverPtr driver,
virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;
qemuDomainSecretInfoPtr secinfo = NULL;
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("SCSI passthrough is not supported by this version of qemu"));
- return -1;
- }
-
/* Let's make sure the disk has a controller defined and loaded before
* trying to add it. The controller used by the disk must exist before a
* qemu command line string is generated.
@@ -2754,12 +2748,6 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver,
bool teardowndevice = false;
bool releaseaddr = false;
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE_SCSI_GENERIC)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("SCSI passthrough is not supported by this version of qemu"));
- return -1;
- }
-
if (qemuHostdevPrepareSCSIVHostDevices(driver, vm->def->name, &hostdev, 1) < 0)
return -1;
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index bff3d7aab5..fc0bc6e10c 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -62,7 +62,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 65982d8d74..c939cec5e8 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -63,7 +63,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='mlock'/>
<flag name='device-del-event'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 003eafb5e0..509d6ca098 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -63,7 +63,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index a914df47f2..426c4654fb 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index af4cd3765b..b9c4182a66 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -51,7 +51,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index f468c24ac2..66b25601e7 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 3cbe7e893d..e000aac384 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 65b3712bb9..ebc5e771d9 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 8c051025f9..4eb8a39d94 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index ef43099953..857a9a9f9a 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 71c3d0f53f..7bf1fab8cb 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -51,7 +51,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index d638663c75..8b8d8859c1 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index f1a154c4c4..79320d5229 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 2bded9fc38..fcf94ab720 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 2d66c04c16..10133a1e7e 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index f06df3838d..9be7d8924b 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index fae6487f72..381d050115 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -53,7 +53,6 @@
<flag name='megasas'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 0cd8b351db..f81c73dd03 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 1007db9a7d..30a8e0174a 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 9124cb2079..b30c31cafc 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 022612246b..eda68e59f5 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 62ee3fcf16..b010f731a5 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 7bd5bba7ed..627eb447fe 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index c2aa3e15ce..f97ebdb9d4 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 6bd5683673..5a4371ab83 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -35,7 +35,6 @@
<flag name='virtio-ccw'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 2deb2b09fa..7bf31d9fd5 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index ce70bbad61..a1e2ae6556 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -51,7 +51,6 @@
<flag name='nvram'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index f6e74ee7c6..254a4cf3d8 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -25,7 +25,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='tpm-passthrough'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index b6b1bc12db..e7ab79e006 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -25,7 +25,6 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='tpm-passthrough'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index 1d910a9679..7ceea6b738 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -65,7 +65,6 @@
<flag name='tpm-tis'/>
<flag name='pci-bridge'/>
<flag name='vfio-pci'/>
- <flag name='scsi-generic'/>
<flag name='mem-merge'/>
<flag name='drive-discard'/>
<flag name='mlock'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6038053d8d..de44c40572 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1215,11 +1215,9 @@ mymain(void)
DO_TEST_PARSE_ERROR("disk-address-conflict",
QEMU_CAPS_ICH9_AHCI);
DO_TEST_PARSE_ERROR("disk-hostdev-scsi-address-conflict",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_PARSE_ERROR("hostdevs-drive-address-conflict",
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("event_idx",
QEMU_CAPS_VIRTIO_BLK_EVENT_IDX,
QEMU_CAPS_VIRTIO_NET_EVENT_IDX,
@@ -2444,43 +2442,43 @@ mymain(void)
QEMU_CAPS_DEVICE_PXB_PCIE);
DO_TEST("hostdev-scsi-lsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-scsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-readonly",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-scsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-lsi-iscsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-lsi-iscsi-auth",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-iscsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-iscsi-auth",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("disk-hostdev-scsi-virtio-iscsi-auth-AES",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_OBJECT_SECRET,
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI,
+ QEMU_CAPS_OBJECT_SECRET,
QEMU_CAPS_ISCSI_PASSWORD_SECRET);
DO_TEST("hostdev-scsi-vhost-scsi-ccw",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_CCW);
+ QEMU_CAPS_CCW);
DO_TEST("hostdev-scsi-vhost-scsi-pci",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_DEVICE_VHOST_SCSI);
DO_TEST("hostdev-scsi-vhost-scsi-pcie",
QEMU_CAPS_KVM,
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC,
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY);
@@ -2880,8 +2878,7 @@ mymain(void)
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_CHARDEV_FILE_APPEND,
QEMU_CAPS_CCID_EMULATED,
- QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS);
DO_TEST("master-key", QEMU_CAPS_OBJECT_SECRET);
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 43eac2f066..414583a73a 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -905,55 +905,54 @@ mymain(void)
DO_TEST("hostdev-scsi-vhost-scsi-ccw",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_CCW);
+ QEMU_CAPS_CCW);
DO_TEST("hostdev-scsi-vhost-scsi-pci",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_DEVICE_VHOST_SCSI);
DO_TEST("hostdev-scsi-vhost-scsi-pcie",
QEMU_CAPS_KVM,
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC,
QEMU_CAPS_DEVICE_PCIE_ROOT_PORT,
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY);
DO_TEST("hostdev-scsi-lsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-scsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-readonly",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-shareable",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-sgio",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-rawio",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-autogen-address",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-large-unit",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-lsi-iscsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-lsi-iscsi-auth",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-iscsi",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-scsi-virtio-iscsi-auth",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC);
+ QEMU_CAPS_VIRTIO_SCSI,
+ QEMU_CAPS_SCSI_LSI);
DO_TEST("hostdev-subsys-mdev-vfio-ccw",
QEMU_CAPS_CCW,
--
2.17.1
More information about the libvir-list
mailing list