[libvirt] [PATCH] Support Xen sysctl version 9 in Xen 4.2
Xen upstream c/s 24102:dc8e55c9 bumped the sysctl version to 9. Support this sysctl version in the xen_hypervisor sub-driver. --- src/xen/xen_hypervisor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index fdc3071..3244bbd 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2164,6 +2164,18 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) goto done; } + /* Xen 4.2 + * sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604 + * domctl version 8 -> unchanged from Xen 4.1 + */ + hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */ + if (virXen_getdomaininfo(fd, 0, &info) == 1) { + hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8"); + goto done; + } + } /* * we failed to make the getdomaininfolist hypercall -- 1.7.10.4
On 09/26/2012 11:05 AM, Jim Fehlig wrote:
Xen upstream c/s 24102:dc8e55c9 bumped the sysctl version to 9. Support this sysctl version in the xen_hypervisor sub-driver. --- src/xen/xen_hypervisor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
ACK. -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Wed, Sep 26, 2012 at 11:05:52AM -0600, Jim Fehlig wrote:
Xen upstream c/s 24102:dc8e55c9 bumped the sysctl version to 9. Support this sysctl version in the xen_hypervisor sub-driver. --- src/xen/xen_hypervisor.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index fdc3071..3244bbd 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2164,6 +2164,18 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) goto done; }
+ /* Xen 4.2 + * sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604 + * domctl version 8 -> unchanged from Xen 4.1 + */ + hv_versions.sys_interface = 9; /* XEN_SYSCTL_INTERFACE_VERSION */ + if (virXen_getdomaininfo(fd, 0, &info) == 1) { + hv_versions.dom_interface = 8; /* XEN_DOMCTL_INTERFACE_VERSION */ + if (virXen_getvcpusinfo(fd, 0, 0, ipt, NULL, 0) == 0){ + VIR_DEBUG("Using hypervisor call v2, sys ver9 dom ver8"); + goto done; + } + }
/* * we failed to make the getdomaininfolist hypercall
ACK, the usual change. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
participants (3)
-
Daniel P. Berrange -
Eric Blake -
Jim Fehlig