]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: hotplug: fix mdev attach for vfio-ccw
authorBjoern Walk <bwalk@linux.ibm.com>
Tue, 26 Jun 2018 11:47:39 +0000 (13:47 +0200)
committerJohn Ferlan <jferlan@redhat.com>
Tue, 26 Jun 2018 18:57:32 +0000 (14:57 -0400)
Mediated devices of model 'vfio-ccw' are using CCW addresses, so make
sure to call the correct address preparation code for the model.

Reviewed-by: Shalini Chellathurai Saroja <shalini@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Signed-off-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
src/qemu/qemu_hotplug.c

index 58cb0539e15a5fc3b6f9b06588eca45c3c353b4a..965b051fd71bc019b0724b30289dc6b83d761177 100644 (file)
@@ -2446,8 +2446,15 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver,
     virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV,
                                 { .hostdev = hostdev } };
 
-    if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)
-        return -1;
+    switch (hostdev->source.subsys.u.mdev.model) {
+    case VIR_MDEV_MODEL_TYPE_VFIO_PCI:
+        if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)
+            return -1;
+        break;
+    case VIR_MDEV_MODEL_TYPE_VFIO_CCW:
+    case VIR_MDEV_MODEL_TYPE_LAST:
+        break;
+    }
 
     if (qemuHostdevPrepareMediatedDevices(driver,
                                           vm->def->name,