[PATCH 15/22] qemu: Always reject 'virtio-s390' addresses
QEMU_CAPS_VIRTIO_S390 can never be asserted any more, add an explicit
check that will reject the 'virtio-s390' address type and remove the
code which would auto-fill them.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_domain_address.c | 5 -----
src/qemu/qemu_validate.c | 6 +++++-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 10cf5eb6f4..93942be559 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -421,9 +421,6 @@ qemuDomainAssignS390Addresses(virDomainDef *def,
if (!(addrs = virDomainCCWAddressSetCreateFromDomain(def)))
goto cleanup;
- } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) {
- /* deal with legacy virtio-s390 */
- qemuDomainPrimeVirtioDeviceAddresses(def,
VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390);
}
ret = 0;
@@ -3271,8 +3268,6 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr,
if (qemuDomainIsS390CCW(vm->def) &&
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;
} else {
if (!qemuDomainCheckCCWS390AddressSupport(vm->def, info, priv->qemuCaps,
devicename))
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 669c45b3c5..16f77611c8 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1309,11 +1309,15 @@ qemuValidateDomainDeviceDefAddress(const virDomainDeviceDef *dev,
break;
}
+ case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390:
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("'virtio-s390' addresses are no longer
supported"));
+ return -1;
+
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE:
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL:
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCID:
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB:
- case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390:
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW:
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO:
case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA:
--
2.31.1