External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 04:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove last uses of QEMU_CAPS_VIRTIO_S390

Browse Source 
Modify the code in the last two instances in the code to behave as if
the flag is not asserted.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2021-06-11 14:59:05 +02:00
parent 3dc7a0e934
commit 69da676aa3
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_domain.c
View File

@ -10666,12 +10666,10 @@ qemuDomainCheckCCWS390AddressSupport(const virDomainDef *def,
return false; return false;
} }
} else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) { } else if (info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) {
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_S390)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtio S390 address type is not supported by "
_("virtio S390 address type is not supported by " "this QEMU"));
"this QEMU")); return false;
return false;
}
} }
return true; return true;
} }

4
src/qemu/qemu_hotplug.c
View File

@ -1246,10 +1246,6 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
if (virDomainCCWAddressAssign(&net->info, ccwaddrs, if (virDomainCCWAddressAssign(&net->info, ccwaddrs,
!net->info.addr.ccw.assigned) < 0) !net->info.addr.ccw.assigned) < 0)
goto cleanup; goto cleanup;
} else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("virtio-s390 net device cannot be hotplugged."));
goto cleanup;
} else if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) { } else if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0) {
goto cleanup; goto cleanup;
} }