SHA256
1
0
forked from pool/libvirt

- Support Xen sysctl version 9

371ddc98-xen-sysctl-9.patch
  bnc#781425

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=230
This commit is contained in:
James Fehlig 2012-09-26 20:34:15 +00:00 committed by Git OBS Bridge
parent 3296360f5b
commit 4378c255d8
3 changed files with 41 additions and 0 deletions

View File

@ -0,0 +1,32 @@
commit 371ddc98664cbbd8542593e5452115ea7918dae2
Author: Jim Fehlig <jfehlig@suse.com>
Date: Wed Sep 26 10:34:17 2012 -0600
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.
Index: libvirt-0.10.2/src/xen/xen_hypervisor.c
===================================================================
--- libvirt-0.10.2.orig/src/xen/xen_hypervisor.c
+++ libvirt-0.10.2/src/xen/xen_hypervisor.c
@@ -2164,6 +2164,18 @@ xenHypervisorInit(struct xenHypervisorVe
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

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Sep 26 14:24:42 MDT 2012 - jfehlig@suse.com
- Support Xen sysctl version 9
371ddc98-xen-sysctl-9.patch
bnc#781425
-------------------------------------------------------------------
Tue Sep 25 16:20:43 MDT 2012 - jfehlig@suse.com

View File

@ -411,6 +411,7 @@ Source1: libvirtd.init
Source2: libvirtd-relocation-server.fw
Source99: baselibs.conf
# Upstream patches
Patch0: 371ddc98-xen-sysctl-9.patch
# Need to go upstream
Patch100: xen-name-for-devid.patch
Patch101: clone.patch
@ -546,6 +547,7 @@ Authors:
%prep
%setup -q
%patch0 -p1
%patch100 -p1
%patch101
%patch102 -p1