From: Shalini Chellathurai Saroja <shalini@xxxxxxxxxxxxxxxxxx>
Let us introduce the capability QEMU_CAPS_CCW for virtual-css-bridge
and replace QEMU_CAPS_VIRTIO_CCW with QEMU_CAPS_CCW in code segments
which identify support for ccw devices.
The virtual-css-bridge is part of the ccw support introduced in QEMU 2.7.
The QEMU_CAPS_CCW capability is based on the existence of the QEMU type.
Let us also add the capability QEMU_CAPS_CCW to the tests which
require support for ccw devices.
Signed-off-by: Shalini Chellathurai Saroja <shalini@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Bjoern Walk <bwalk@xxxxxxxxxxxxx>
Reviewed-by: Boris Fiuczynski <fiuczy@xxxxxxxxxxxxx>
---
src/qemu/qemu_capabilities.c | 9 +++
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_domain.c | 2 +-
src/qemu/qemu_domain_address.c | 4 +-
src/qemu/qemu_hotplug.c | 4 +-
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 +
tests/qemuhotplugtest.c | 2 +-
tests/qemuxml2argvtest.c | 86 ++++++++++++------------
tests/qemuxml2xmltest.c | 26 +++----
13 files changed, 77 insertions(+), 62 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 920a596..ae3d2a6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -475,6 +475,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
"disk-write-cache",
"nbd-tls",
"tpm-crb",
+ "virtual-css-bridge",
);
@@ -1101,6 +1102,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "virtio-mouse-ccw", QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW },
{ "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW },
{ "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE },
+ { "virtual-css-bridge", QEMU_CAPS_CCW },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
@@ -3906,6 +3908,13 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);
+ if (ARCH_IS_S390(qemuCaps->arch)) {
+ /* Legacy assurance for QEMU_CAPS_CCW */
+ if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW) &&
+ virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW))
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_CCW);
+ }
+
ret = 0;
cleanup:
return ret;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index abd6eff..e8a916c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -459,6 +459,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cache param */
QEMU_CAPS_NBD_TLS, /* NBD server supports TLS transport */
QEMU_CAPS_DEVICE_TPM_CRB, /* -device tpm-crb */
+ QEMU_CAPS_CCW, /* -device virtual-css-bridge */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 727ea33..fcf95b1 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11782,7 +11782,7 @@ qemuDomainCheckCCWS390AddressSupport(const virDomainDef *def,
"'%s' using machine type '%s'"),
devicename, def->os.machine);
return false;
- } else if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW)) {
+ } else if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("CCW address type is not supported by "
"this QEMU"));
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index ce2b079..8a5ff74 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -396,7 +396,7 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def,
virDomainCCWAddressSetPtr addrs = NULL;
if (qemuDomainIsS390CCW(def) &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW)) {
+ virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) {
qemuDomainPrimeVirtioDeviceAddresses(
def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW);
@@ -2985,7 +2985,7 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr,
if (!info->type) {
if (qemuDomainIsS390CCW(vm->def) &&
- virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW))
+ virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW))
info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW;
else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390))
info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390;
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 9ca8e66..a8e0e91 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1001,7 +1001,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
}
if (qemuDomainIsS390CCW(vm->def) &&
- virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW)) {
+ virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) {
net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW;
if (!(ccwaddrs = qemuDomainCCWAddrSetCreateFromDomain(vm->def)))
goto cleanup;
@@ -2437,7 +2437,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriverPtr driver,
if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
if (qemuDomainIsS390CCW(vm->def) &&
- virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW))
+ virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW))
hostdev->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW;
}
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 098326e..24bd8e8 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -114,6 +114,7 @@
<flag name='qcow2-luks'/>
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
+ <flag name='virtual-css-bridge'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>303326</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 64bd554..6776031 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -119,6 +119,7 @@
<flag name='seccomp-blacklist'/>
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
+ <flag name='virtual-css-bridge'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>342058</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index 2662873..10ce426 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -104,6 +104,7 @@
<flag name='dump-completed'/>
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
+ <flag name='virtual-css-bridge'/>
<version>2007000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>216732</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 3449ca5..800fcc5 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -106,6 +106,7 @@
<flag name='dump-completed'/>
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
+ <flag name='virtual-css-bridge'/>
<version>2007093</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>241633</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 2122a51..f8aee83 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -109,6 +109,7 @@
<flag name='dump-completed'/>
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
+ <flag name='virtual-css-bridge'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>265051</microcodeVersion>
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 85e5365..0c88f36 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -74,7 +74,7 @@ qemuHotplugCreateObjects(virDomainXMLOptionPtr xmlopt,
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
- virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_CCW);
+ virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_CCW);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL);
virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_DISK_WWN);
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index ddf567b..9a05803 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -965,11 +965,11 @@ mymain(void)
DO_TEST("disk-many", NONE);
DO_TEST("disk-virtio", QEMU_CAPS_DRIVE_BOOT);
DO_TEST("disk-virtio-ccw",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("disk-virtio-ccw-many",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("disk-order",
QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_BLK_SCSI);
DO_TEST("disk-virtio-drive-queues",
@@ -1240,7 +1240,7 @@ mymain(void)
DO_TEST("net-virtio-s390",
QEMU_CAPS_VIRTIO_S390);
DO_TEST("net-virtio-ccw",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("net-virtio-rxtxqueuesize",
QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE,
QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE);
@@ -1353,7 +1353,7 @@ mymain(void)
QEMU_CAPS_VIRTIO_S390);
DO_TEST("console-virtio-ccw",
QEMU_CAPS_BOOTINDEX,
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390);
DO_TEST("console-sclp",
QEMU_CAPS_VIRTIO_S390,
@@ -1516,7 +1516,7 @@ mymain(void)
QEMU_CAPS_OBJECT_USB_AUDIO);
DO_TEST("fs9p", NONE);
DO_TEST("fs9p-ccw",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("hostdev-usb-address", NONE);
DO_TEST("hostdev-usb-address-device", NONE);
@@ -1560,13 +1560,13 @@ mymain(void)
DO_TEST_FAILURE("iothreads-nocap", NONE);
DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD);
DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("iothreads-virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI,
QEMU_CAPS_OBJECT_IOTHREAD,
QEMU_CAPS_VIRTIO_SCSI_IOTHREAD);
DO_TEST("iothreads-virtio-scsi-ccw", QEMU_CAPS_OBJECT_IOTHREAD,
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI_IOTHREAD,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("cpu-topology1", NONE);
DO_TEST("cpu-topology2", NONE);
@@ -1598,7 +1598,7 @@ mymain(void)
DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM);
qemuTestSetHostArch(driver.caps, VIR_ARCH_S390X);
- DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM, QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("cpu-s390-features", QEMU_CAPS_KVM, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION);
DO_TEST_FAILURE("cpu-s390-features", QEMU_CAPS_KVM);
qemuTestSetHostArch(driver.caps, VIR_ARCH_NONE);
@@ -1936,7 +1936,7 @@ mymain(void)
QEMU_CAPS_OBJECT_RNG_EGD);
DO_TEST("virtio-rng-ccw",
QEMU_CAPS_BOOTINDEX,
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390,
QEMU_CAPS_DEVICE_VIRTIO_RNG,
QEMU_CAPS_OBJECT_RNG_RANDOM);
@@ -1953,28 +1953,28 @@ mymain(void)
QEMU_CAPS_OBJECT_RNG_RANDOM);
DO_TEST("s390-panic-no-address",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("s390-panic-address",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-panic-missing",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390);
DO_TEST_PARSE_ERROR("s390-no-parallel",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-serial",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390,
QEMU_CAPS_DEVICE_SCLPCONSOLE);
DO_TEST("s390-serial-2",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390,
QEMU_CAPS_DEVICE_SCLPCONSOLE,
QEMU_CAPS_DEVICE_SCLPLMCONSOLE);
DO_TEST("s390-serial-console",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390,
QEMU_CAPS_DEVICE_SCLPCONSOLE);
@@ -2315,7 +2315,7 @@ mymain(void)
# endif
DO_TEST("hostdev-scsi-vhost-scsi-ccw",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
- QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_VIRTIO_CCW);
+ QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_CCW);
DO_TEST("hostdev-scsi-vhost-scsi-pci",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
QEMU_CAPS_DEVICE_SCSI_GENERIC);
@@ -2569,99 +2569,99 @@ mymain(void)
QEMU_CAPS_AES_KEY_WRAP,
QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-aeskeywrap-on-caps",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-aeskeywrap-on-caps", NONE);
DO_TEST("machine-aeskeywrap-on-cap",
QEMU_CAPS_AES_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-aeskeywrap-on-cap",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-aeskeywrap-on-cap", NONE);
DO_TEST("machine-aeskeywrap-off-caps",
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-aeskeywrap-off-caps",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-aeskeywrap-off-caps", NONE);
DO_TEST("machine-aeskeywrap-off-cap",
QEMU_CAPS_AES_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-aeskeywrap-off-cap",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-aeskeywrap-off-cap", NONE);
DO_TEST("machine-deakeywrap-on-caps",
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-deakeywrap-on-caps",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-deakeywrap-on-caps", NONE);
DO_TEST("machine-deakeywrap-on-cap",
QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-deakeywrap-on-cap",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-deakeywrap-on-cap", NONE);
DO_TEST("machine-deakeywrap-off-caps",
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-deakeywrap-off-caps",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-deakeywrap-off-caps", NONE);
DO_TEST("machine-deakeywrap-off-cap",
QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-deakeywrap-off-cap",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST_FAILURE("machine-deakeywrap-off-cap", NONE);
DO_TEST("machine-keywrap-none-caps",
QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP,
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("machine-keywrap-none",
QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("machine-loadparm-s390",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390,
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390,
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_LOADPARM);
DO_TEST("machine-loadparm-net-s390",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390,
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390,
QEMU_CAPS_BOOTINDEX, QEMU_CAPS_LOADPARM);
DO_TEST("machine-loadparm-multiple-disks-nets-s390",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX,
QEMU_CAPS_LOADPARM);
DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX,
QEMU_CAPS_LOADPARM);
DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_BOOTINDEX,
QEMU_CAPS_LOADPARM);
@@ -2807,14 +2807,14 @@ mymain(void)
DO_TEST("disk-many-format-probing", QEMU_CAPS_DRIVE_BOOT);
driver.config->allowDiskFormatProbing = false;
- DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_VIRTIO_CCW,
+ DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
- DO_TEST("input-virtio-ccw", QEMU_CAPS_VIRTIO_CCW,
+ DO_TEST("input-virtio-ccw", QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_KEYBOARD,
QEMU_CAPS_VIRTIO_MOUSE,
QEMU_CAPS_VIRTIO_TABLET,
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 53a26a0..f0b1c34 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -502,11 +502,11 @@ mymain(void)
DO_TEST("cputune-iothreads", NONE);
DO_TEST("iothreads-disk", NONE);
DO_TEST("iothreads-disk-virtio-ccw",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("iothreads-virtio-scsi-pci",
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST("iothreads-virtio-scsi-ccw",
- QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_S390);
DO_TEST("lease", NONE);
DO_TEST("event_idx", NONE);
@@ -910,7 +910,7 @@ 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_VIRTIO_CCW);
+ QEMU_CAPS_DEVICE_SCSI_GENERIC, QEMU_CAPS_CCW);
DO_TEST("hostdev-scsi-vhost-scsi-pci",
QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI,
QEMU_CAPS_DEVICE_SCSI_GENERIC);
@@ -961,19 +961,19 @@ mymain(void)
QEMU_CAPS_DEVICE_SCSI_GENERIC);
DO_TEST("s390-defaultconsole",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-panic",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-panic-missing",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-panic-no-address",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-serial",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-serial-2",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("s390-serial-console",
- QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
+ QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("pcihole64", NONE);
DO_TEST("pcihole64-gib", NONE);
@@ -1116,14 +1116,14 @@ mymain(void)
DO_TEST("video-qxl-noheads", NONE);
DO_TEST("video-virtio-gpu-secondary", NONE);
DO_TEST("video-virtio-gpu-ccw",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
QEMU_CAPS_VNC,
QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW);
DO_TEST("video-virtio-gpu-ccw-auto",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_DEVICE_VIRTIO_GPU,
QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS,
@@ -1165,7 +1165,7 @@ mymain(void)
DO_TEST("user-aliases", NONE);
DO_TEST("input-virtio-ccw",
- QEMU_CAPS_VIRTIO_CCW,
+ QEMU_CAPS_CCW,
QEMU_CAPS_VIRTIO_KEYBOARD,
QEMU_CAPS_VIRTIO_MOUSE,
QEMU_CAPS_VIRTIO_TABLET,
--
2.9.4
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
