qemu: mdev: Set vfio device property 'display' to off only if mdev is vfio-pci

[libvirt] [PATCH] qemu: mdev: Set vfio device property 'display' to off only if mdev is vfio-pci

Posted by Farhan Ali 5 years, 7 months ago

S390 is aware of both vfio-pci and vfio-ccw devices, so
on S390 the capability QEMU_CAPS_VFIO_PCI_DISPLAY will be
available. Add an extra check to make sure we only set the
display to off for vfio-pci mediated devices. Otherwise we
add display for vfio-ccw device and this breaks vfio-ccw
device qemu command line.

Fixes: d54e45b6e conf: Introduce new <hostdev> attribute 'display'
Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
---
 src/qemu/qemu_domain.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 22c6d8f..df7e937 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -6375,6 +6375,7 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDevPtr mdevsrc,
     /* QEMU 2.12 added support for vfio-pci display type, we default to
      * 'display=off' to stay safe from future changes */
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) &&
+        mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
         mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT)
         mdevsrc->display = VIR_TRISTATE_SWITCH_OFF;
 
-- 
2.7.4

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

Re: [libvirt] [PATCH] qemu: mdev: Set vfio device property 'display' to off only if mdev is vfio-pci

Posted by Erik Skultety 5 years, 7 months ago

On Thu, Aug 30, 2018 at 01:07:34PM -0400, Farhan Ali wrote:
> S390 is aware of both vfio-pci and vfio-ccw devices, so
> on S390 the capability QEMU_CAPS_VFIO_PCI_DISPLAY will be
> available. Add an extra check to make sure we only set the
> display to off for vfio-pci mediated devices. Otherwise we
> add display for vfio-ccw device and this breaks vfio-ccw
> device qemu command line.
>
> Fixes: d54e45b6e conf: Introduce new <hostdev> attribute 'display'
> Signed-off-by: Farhan Ali <alifm@linux.ibm.com>
> Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
> ---
>  src/qemu/qemu_domain.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index 22c6d8f..df7e937 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -6375,6 +6375,7 @@ qemuDomainHostdevDefMdevPostParse(virDomainHostdevSubsysMediatedDevPtr mdevsrc,
>      /* QEMU 2.12 added support for vfio-pci display type, we default to
>       * 'display=off' to stay safe from future changes */
>      if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VFIO_PCI_DISPLAY) &&
> +        mdevsrc->model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
>          mdevsrc->display == VIR_TRISTATE_SWITCH_ABSENT)
>          mdevsrc->display = VIR_TRISTATE_SWITCH_OFF;

Reviewed-by: Erik Skultety <eskultet@redhat.com>

and safe for freeze...

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