mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
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>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
(cherry picked from commit 015a373351)
This commit is contained in:
1 parent
7b161be2e5
commit
de3e45c2ec
1 file changed
+12
@@ -833,6 +833,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);
|
||||
|
||||