qemu: hotplug: fix mdev attach for vfio-ccw

[libvirt] [PATCH] qemu: hotplug: fix mdev attach for vfio-ccw

Posted by Bjoern Walk 5 years, 10 months ago

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>
---
 src/qemu/qemu_hotplug.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 7a1bbc7c..46d30ddd 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -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,
-- 
2.17.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu: hotplug: fix mdev attach for vfio-ccw

Posted by John Ferlan 5 years, 10 months ago


On 06/26/2018 07:47 AM, Bjoern Walk wrote:
> 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>
> ---
>  src/qemu/qemu_hotplug.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 

Reviewed-by: John Ferlan <jferlan@redhat.com>
(and pushed)

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu: hotplug: fix mdev attach for vfio-ccw

Posted by Bjoern Walk 5 years, 10 months ago

John Ferlan <jferlan@redhat.com> [2018-06-26, 03:03PM -0400]:
> 
> 
> On 06/26/2018 07:47 AM, Bjoern Walk wrote:
> > 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>
> > ---
> >  src/qemu/qemu_hotplug.c | 11 +++++++++--
> >  1 file changed, 9 insertions(+), 2 deletions(-)
> > 
> 
> Reviewed-by: John Ferlan <jferlan@redhat.com>
> (and pushed)

Thanks a bunch!

> 
> John
> 
> --
> libvir-list mailing list
> libvir-list@redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list
> 

-- 
IBM Systems
Linux on Z & Virtualization Development
------------------------------------------------------------------------
IBM Deutschland Research & Development GmbH
Schönaicher Str. 220, 71032 Böblingen
Phone: +49 7031 16 1819
------------------------------------------------------------------------
Vorsitzende des Aufsichtsrats: Martina Koederitz
Geschäftsführung: Dirk Wittkopp
Sitz der Gesellschaft: Böblingen
Registergericht: Amtsgericht Stuttgart, HRB 243294 
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list