On 03/12/2020 13.36, Michal Privoznik wrote: > Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> > --- > src/qemu/qemu_domain_address.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c > index 2788dc7fb3..d872f75b38 100644 > --- a/src/qemu/qemu_domain_address.c > +++ b/src/qemu/qemu_domain_address.c > @@ -408,18 +408,16 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, > if (qemuDomainIsS390CCW(def) && > virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) { > if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_CCW)) > - qemuDomainPrimeVfioDeviceAddresses( > - def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); > - qemuDomainPrimeVirtioDeviceAddresses( > - def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); > + qemuDomainPrimeVfioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); > + > + qemuDomainPrimeVirtioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); > > 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); > + qemuDomainPrimeVirtioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390); > } > > ret = 0; > Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>