forked from pool/libvirt
0119ca3996
- Adding device removal or deletion events
- Introduce new domain create APIs to pass pre-opened FDs to LXC
- Add interface versions for Xen 4.3
- Add new public API virDomainSetMemoryStatsPeriod
- Various LXC improvements
- Many incremental improvements and bug fixes, see
http://libvirt.org/news.html
- Drop upstream patches: f38c8185-CVE-2013-2230.patch,
fd2e3c4c-xen-sysctl-domctl.patch, dfc69235-CVE-2013-4153.patch,
96518d43-CVE-2013-4154.patch, fe89fd3b-storage-pool-deadlock.patch
- Drop relax-qemu-usergroup-check.patch - no longer needed
after hypervisor-specific daemon package split
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=290
138 lines
5.0 KiB
Diff
138 lines
5.0 KiB
Diff
>From 5aeda96eafd230af55343e7ef835e081ded484aa Mon Sep 17 00:00:00 2001
|
|
From: Chunyan Liu <cyliu@suse.com>
|
|
Date: Fri, 25 Jan 2013 17:37:14 +0800
|
|
Subject: [PATCH] support managed pci devices in xen driver
|
|
|
|
---
|
|
src/xenxs/xen_sxpr.c | 22 ++++++++--------------
|
|
src/xenxs/xen_xm.c | 28 +++++++++++++++++++++++++++-
|
|
2 files changed, 35 insertions(+), 15 deletions(-)
|
|
|
|
Index: libvirt-1.1.1/src/xenxs/xen_sxpr.c
|
|
===================================================================
|
|
--- libvirt-1.1.1.orig/src/xenxs/xen_sxpr.c
|
|
+++ libvirt-1.1.1/src/xenxs/xen_sxpr.c
|
|
@@ -993,6 +993,7 @@ xenParseSxprPCI(virDomainDefPtr def,
|
|
int busID;
|
|
int slotID;
|
|
int funcID;
|
|
+ bool managed;
|
|
|
|
node = cur->u.s.car;
|
|
if (!sexpr_lookup(node, "dev"))
|
|
@@ -1040,11 +1041,13 @@ xenParseSxprPCI(virDomainDefPtr def,
|
|
goto error;
|
|
}
|
|
|
|
+ managed = sexpr_int(node, "dev/opts/managed");
|
|
+
|
|
if (!(dev = virDomainHostdevDefAlloc()))
|
|
goto error;
|
|
|
|
dev->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS;
|
|
- dev->managed = false;
|
|
+ dev->managed = managed ? true : false;
|
|
dev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
|
|
dev->source.subsys.u.pci.addr.domain = domainID;
|
|
dev->source.subsys.u.pci.addr.bus = busID;
|
|
@@ -1993,11 +1996,15 @@ static void
|
|
xenFormatSxprPCI(virDomainHostdevDefPtr def,
|
|
virBufferPtr buf)
|
|
{
|
|
- virBufferAsprintf(buf, "(dev (domain 0x%04x)(bus 0x%02x)(slot 0x%02x)(func 0x%x))",
|
|
+ virBufferAsprintf(buf, "(dev (domain 0x%04x)(bus 0x%02x)(slot 0x%02x)(func 0x%x)",
|
|
def->source.subsys.u.pci.addr.domain,
|
|
def->source.subsys.u.pci.addr.bus,
|
|
def->source.subsys.u.pci.addr.slot,
|
|
def->source.subsys.u.pci.addr.function);
|
|
+
|
|
+ if (def->managed)
|
|
+ virBufferAddLit(buf, "(opts (managed 1))");
|
|
+ virBufferAddLit(buf, ")");
|
|
}
|
|
|
|
|
|
@@ -2016,12 +2023,6 @@ xenFormatSxprOnePCI(virDomainHostdevDefP
|
|
virBufferPtr buf,
|
|
int detach)
|
|
{
|
|
- if (def->managed) {
|
|
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
- _("managed PCI devices not supported with XenD"));
|
|
- return -1;
|
|
- }
|
|
-
|
|
virBufferAddLit(buf, "(pci ");
|
|
xenFormatSxprPCI(def, buf);
|
|
if (detach)
|
|
@@ -2076,12 +2077,6 @@ xenFormatSxprAllPCI(virDomainDefPtr def,
|
|
for (i = 0; i < def->nhostdevs; i++) {
|
|
if (def->hostdevs[i]->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
|
|
def->hostdevs[i]->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI) {
|
|
- if (def->hostdevs[i]->managed) {
|
|
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
|
|
- _("managed PCI devices not supported with XenD"));
|
|
- return -1;
|
|
- }
|
|
-
|
|
xenFormatSxprPCI(def->hostdevs[i], buf);
|
|
}
|
|
}
|
|
Index: libvirt-1.1.1/src/xenxs/xen_xm.c
|
|
===================================================================
|
|
--- libvirt-1.1.1.orig/src/xenxs/xen_xm.c
|
|
+++ libvirt-1.1.1/src/xenxs/xen_xm.c
|
|
@@ -802,6 +802,8 @@ xenParseXM(virConfPtr conf, int xendConf
|
|
int busID;
|
|
int slotID;
|
|
int funcID;
|
|
+ char *opt;
|
|
+ int managed = 0;
|
|
|
|
domain[0] = bus[0] = slot[0] = func[0] = '\0';
|
|
|
|
@@ -811,6 +813,11 @@ xenParseXM(virConfPtr conf, int xendConf
|
|
/* pci=['0000:00:1b.0','0000:00:13.0'] */
|
|
if (!(key = list->str))
|
|
goto skippci;
|
|
+
|
|
+ opt = strchr(key, ',');
|
|
+ if (opt)
|
|
+ opt++;
|
|
+
|
|
if (!(nextkey = strchr(key, ':')))
|
|
goto skippci;
|
|
|
|
@@ -859,10 +866,30 @@ xenParseXM(virConfPtr conf, int xendConf
|
|
if (virStrToLong_i(func, NULL, 16, &funcID) < 0)
|
|
goto skippci;
|
|
|
|
+ if (opt) {
|
|
+ char opt_managed[2];
|
|
+ char *data;
|
|
+
|
|
+ opt_managed[0] = '\0';
|
|
+ data = strchr(opt, '=');
|
|
+ data++;
|
|
+
|
|
+ if (STRPREFIX(opt, "managed=")) {
|
|
+ if (virStrncpy(opt_managed, data, 1, sizeof(opt_managed)) == NULL) {
|
|
+ virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
+ _("managed option %s too big for destination"),
|
|
+ data);
|
|
+ goto skippci;
|
|
+ }
|
|
+ }
|
|
+ if (virStrToLong_i(opt_managed, NULL, 10, &managed) < 0)
|
|
+ goto skippci;
|
|
+ }
|
|
+
|
|
if (!(hostdev = virDomainHostdevDefAlloc()))
|
|
goto cleanup;
|
|
|
|
- hostdev->managed = false;
|
|
+ hostdev->managed = managed ? true : false;
|
|
hostdev->source.subsys.type = VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI;
|
|
hostdev->source.subsys.u.pci.addr.domain = domainID;
|
|
hostdev->source.subsys.u.pci.addr.bus = busID;
|