38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
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@citrix.com>
|
||
|
|
|
||
|
|
--- a/tools/libxl/libxl_qmp.c
|
||
|
|
+++ b/tools/libxl/libxl_qmp.c
|
||
|
|
@@ -835,6 +835,18 @@ int libxl__qmp_pci_add(libxl__gc *gc, in
|
||
|
|
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);
|