From: Bjoern Walk <bwalk@linux.ibm.com>
Date: Mon, 28 Oct 2019 08:06:13 +0000 (+0100)
Subject: qemu: hotplug: ensure address generation for vfio-ccw
X-Git-Tag: v5.10.0-rc1~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3666d7ac6931077ce8fc4eb9c629a8b220242344;p=thirdparty%2Flibvirt.git

qemu: hotplug: ensure address generation for vfio-ccw

When attaching a mediated host device of model vfio-ccw without
specifying a guest-address, none is generated by libvirt. Let's fix this
and make sure to generate a device address during live-hotplug.

Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 374c85042d..811ad952c5 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2799,7 +2799,13 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver,
         if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)
             return -1;
         break;
-    case VIR_MDEV_MODEL_TYPE_VFIO_CCW:
+    case VIR_MDEV_MODEL_TYPE_VFIO_CCW: {
+        const char *devName = hostdev->source.subsys.u.mdev.uuidstr;
+        bool releaseaddr = false;
+
+        if (qemuDomainEnsureVirtioAddress(&releaseaddr, vm, &dev, devName) < 0)
+            return -1;
+    }   break;
     case VIR_MDEV_MODEL_TYPE_LAST:
         break;
     }