diff --git a/9785f2b6-fix-xen-sysctl9.patch b/9785f2b6-fix-xen-sysctl9.patch new file mode 100644 index 0000000..1a5fd38 --- /dev/null +++ b/9785f2b6-fix-xen-sysctl9.patch @@ -0,0 +1,48 @@ +commit 9785f2b6f203ad5f153e68829b95f0e8c30a1560 +Author: Jim Fehlig +Date: Tue Oct 23 11:18:20 2012 -0600 + + Fix detection of Xen sysctl version 9 + + In commit 371ddc98, I mistakenly added the check for sysctl + version 9 after setting the hypercall version to 1, which will + fail with + + error : xenHypervisorDoV1Op:967 : Unable to issue hypervisor + ioctl 3166208: Function not implemented + + This check should be included along with the others that use + hypercall version 2. + +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 +@@ -2157,13 +2157,6 @@ xenHypervisorInit(struct xenHypervisorVe + } + } + +- hv_versions.hypervisor = 1; +- hv_versions.sys_interface = -1; +- if (virXen_getdomaininfo(fd, 0, &info) == 1) { +- VIR_DEBUG("Using hypervisor call v1"); +- goto done; +- } +- + /* Xen 4.2 + * sysctl version 9 -> xen-unstable c/s 24102:dc8e55c90604 + * domctl version 8 -> unchanged from Xen 4.1 +@@ -2177,6 +2170,13 @@ xenHypervisorInit(struct xenHypervisorVe + } + } + ++ hv_versions.hypervisor = 1; ++ hv_versions.sys_interface = -1; ++ if (virXen_getdomaininfo(fd, 0, &info) == 1) { ++ VIR_DEBUG("Using hypervisor call v1"); ++ goto done; ++ } ++ + /* + * we failed to make the getdomaininfolist hypercall + */ diff --git a/libvirt-suse-netcontrol.patch b/libvirt-suse-netcontrol.patch index bf98226..2423bb7 100644 --- a/libvirt-suse-netcontrol.patch +++ b/libvirt-suse-netcontrol.patch @@ -10,7 +10,7 @@ Index: libvirt-0.10.2/configure.ac UDEV_REQUIRED=145 PCIACCESS_REQUIRED=0.10.0 XMLRPC_REQUIRED=1.14.0 -@@ -1948,6 +1949,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit +@@ -1950,6 +1951,38 @@ AM_CONDITIONAL([WITH_NETCF], [test "$wit AC_SUBST([NETCF_CFLAGS]) AC_SUBST([NETCF_LIBS]) @@ -49,7 +49,7 @@ Index: libvirt-0.10.2/configure.ac AC_ARG_WITH([secrets], AC_HELP_STRING([--with-secrets], [with local secrets management driver @<:@default=yes@:>@]),[],[with_secrets=yes]) -@@ -3183,6 +3216,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ +@@ -3185,6 +3218,11 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $ else AC_MSG_NOTICE([ netcf: no]) fi diff --git a/libvirt.changes b/libvirt.changes index d7e3e34..244556c 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 23 14:33:40 MDT 2012 - jfehlig@suse.com + +- Fix Xen sysctl version 9 support + 9785f2b6-fix-xen-sysctl9.patch + ------------------------------------------------------------------- Thu Oct 11 08:34:36 MDT 2012 - jfehlig@suse.com diff --git a/libvirt.spec b/libvirt.spec index 7844cf6..bcee46f 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -415,6 +415,7 @@ Patch0: 371ddc98-xen-sysctl-9.patch Patch1: 416eca18-xenstore-header-fix.patch Patch2: f644361b-virCommand-env.patch Patch3: 2b32735a-virCommand-env.patch +Patch4: 9785f2b6-fix-xen-sysctl9.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch @@ -554,6 +555,7 @@ Authors: %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch100 -p1 %patch101 %patch102 -p1