[Xen-changelog] [xen stable-4.5] tools: libxl: allow permissive qemu-upstream pci passthrough.

[patchbot@xxxxxxx]

commit 5461ad29be44cdc0efb9f200a119f2a46a0ec059
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Mon Jun 1 11:32:23 2015 +0100
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Tue Oct 20 17:57:04 2015 +0100

    tools: libxl: allow permissive qemu-upstream pci passthrough.
    
    Since XSA-131 qemu-xen now restricts access to PCI cfg by default. In
    order to allow local configuration of the existing libxl_device_pci
    "permissive" flag needs to be plumbed through via the new QMP property
    added by the XSA-131 patches.
    
    Versions of QEMU prior to XSA-131 did not support this permissive
    property, so we only pass it if it is true. Older versions only
    supported permissive mode.
    
    qemu-xen-traditional already supports the permissive mode setting via
    xenstore.
    
    Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    Cc: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Cc: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Acked-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
    Acked-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    (cherry picked from commit 015a373351e5c3553f848324ac0f07a9d92883fa)
---
 tools/libxl/libxl_qmp.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c
index c7324e6..25b62cd 100644
--- a/tools/libxl/libxl_qmp.c
+++ b/tools/libxl/libxl_qmp.c
@@ -828,6 +828,18 @@ int libxl__qmp_pci_add(libxl__gc *gc, int domid, 
libxl_device_pci *pcidev)
         QMP_PARAMETERS_SPRINTF(&args, "addr", "%x.%x",
                                PCI_SLOT(pcidev->vdevfn), 
PCI_FUNC(pcidev->vdevfn));
     }
+    /*
+     * Version of QEMU prior to the XSA-131 fix did not support this
+     * property and were effectively always in permissive mode. The
+     * fix for XSA-131 switched the default to be restricted by
+     * default and added the permissive property.
+     *
+     * Therefore in order to support both old and new QEMU we only set
+     * the permissive flag if it is true. Users of older QEMU have no
+     * reason to set the flag so this is ok.
+     */
+    if (pcidev->permissive)
+        qmp_parameters_add_bool(gc, &args, "permissive", true);
 
     rc = qmp_synchronous_send(qmp, "device_add", args,
                               NULL, NULL, qmp->timeout);
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog