Hello community,
here is the log from the commit of package libvirt for openSUSE:Factory checked
in at 2012-10-26 17:13:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libvirt (Old)
and /work/SRC/openSUSE:Factory/.libvirt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt", Maintainer is "jfeh...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2012-10-19
06:50:10.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2012-10-26
17:13:48.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Oct 23 14:33:40 MDT 2012 - jfeh...@suse.com
+
+- Fix Xen sysctl version 9 support
+ 9785f2b6-fix-xen-sysctl9.patch
+
+-------------------------------------------------------------------
New:
----
9785f2b6-fix-xen-sysctl9.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libvirt.spec ++++++
--- /var/tmp/diff_new_pack.2vD2yv/_old 2012-10-26 17:13:51.000000000 +0200
+++ /var/tmp/diff_new_pack.2vD2yv/_new 2012-10-26 17:13:51.000000000 +0200
@@ -415,6 +415,7 @@
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 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%patch100 -p1
%patch101
%patch102 -p1
++++++ 9785f2b6-fix-xen-sysctl9.patch ++++++
commit 9785f2b6f203ad5f153e68829b95f0e8c30a1560
Author: Jim Fehlig <jfeh...@suse.com>
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
*/
++++++ libvirt-suse-netcontrol.patch ++++++
--- /var/tmp/diff_new_pack.2vD2yv/_old 2012-10-26 17:13:51.000000000 +0200
+++ /var/tmp/diff_new_pack.2vD2yv/_new 2012-10-26 17:13:51.000000000 +0200
@@ -10,7 +10,7 @@
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 @@
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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
