openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Drop QEMU_CAPS_DEVICE_SCSI_GENERIC 

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@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-09-18 12:29:10 +02:00
parent e1fdffd374
commit 5095394e1e
37 changed files with 78 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/qemu/qemu_capabilities.c
View File

@ -1027,7 +1027,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 },
@ -5155,10 +5154,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);

2
src/qemu/qemu_capabilities.h
View File

@ -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 */

59
src/qemu/qemu_command.c
View File

@ -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;
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 (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)))
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"));
return -1;
}
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;

12
src/qemu/qemu_hotplug.c
View File

@ -2619,12 +2619,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.
@ -2759,12 +2753,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;

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
View File

@ -37,7 +37,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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -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'/>

53
tests/qemuxml2argvtest.c
View File

@ -1212,11 +1212,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,
@ -2441,43 +2439,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);
@ -2877,8 +2875,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);

55
tests/qemuxml2xmltest.c
View File

@ -902,55 +902,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,