Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2012-09-29 15:33:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvirt", Maintainer is "JFEHLIG@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2012-09-26 10:08:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2012-09-29 15:33:31.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 27 10:35:25 MDT 2012 - jfehlig@suse.com + +- Fix build when using -werror + 416eca18-xenstore-header-fix.patch + +------------------------------------------------------------------- +Wed Sep 26 14:24:42 MDT 2012 - jfehlig@suse.com + +- Support Xen sysctl version 9 + 371ddc98-xen-sysctl-9.patch + bnc#781425 + +------------------------------------------------------------------- New: ---- 371ddc98-xen-sysctl-9.patch 416eca18-xenstore-header-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.pkzUwO/_old 2012-09-29 15:33:33.000000000 +0200 +++ /var/tmp/diff_new_pack.pkzUwO/_new 2012-09-29 15:33:33.000000000 +0200 @@ -411,6 +411,8 @@ Source2: libvirtd-relocation-server.fw Source99: baselibs.conf # Upstream patches +Patch0: 371ddc98-xen-sysctl-9.patch +Patch1: 416eca18-xenstore-header-fix.patch # Need to go upstream Patch100: xen-name-for-devid.patch Patch101: clone.patch @@ -546,6 +548,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %patch100 -p1 %patch101 %patch102 -p1 ++++++ 371ddc98-xen-sysctl-9.patch ++++++ 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 ++++++ 416eca18-xenstore-header-fix.patch ++++++ commit 416eca189b1934cfa8575ab72d142ec77600fcf9 Author: Jim Fehlig <jfehlig@suse.com> Date: Wed Sep 26 15:20:35 2012 -0600 Fix compilation of legacy xen driver with Xen 4.2 In Xen 4.2, xs.h is deprecated in favor of xenstore.h. xs.h now contains #warning xs.h is deprecated use xenstore.h instead #include <xenstore.h> which fails compilation when warnings are treated as errors. Introduce a configure-time check for xenstore.h and if found, use it instead of xs.h. Index: libvirt-0.10.2/configure.ac =================================================================== --- libvirt-0.10.2.orig/configure.ac +++ libvirt-0.10.2/configure.ac @@ -768,6 +768,8 @@ if test "$with_xen" != "no" ; then fi if test "$with_xen" != "no" ; then + dnl In Xen 4.2, xs.h is deprecated in favor of xenstore.h. + AC_CHECK_HEADERS([xenstore.h]) AC_CHECK_HEADERS([xen/xen.h xen/version.h xen/dom0_ops.h],,[ if test "$with_xen" = "yes"; then fail=1 Index: libvirt-0.10.2/src/xen/block_stats.c =================================================================== --- libvirt-0.10.2.orig/src/xen/block_stats.c +++ libvirt-0.10.2/src/xen/block_stats.c @@ -32,7 +32,11 @@ # include <unistd.h> # include <regex.h> -# include <xs.h> +# if HAVE_XENSTORE_H +# include <xenstore.h> +# else +# include <xs.h> +# endif # include "virterror_internal.h" # include "datatypes.h" Index: libvirt-0.10.2/src/xen/xs_internal.c =================================================================== --- libvirt-0.10.2.orig/src/xen/xs_internal.c +++ libvirt-0.10.2/src/xen/xs_internal.c @@ -35,7 +35,11 @@ #include <xen/dom0_ops.h> #include <xen/version.h> -#include <xs.h> +#if HAVE_XENSTORE_H +# include <xenstore.h> +#else +# include <xs.h> +#endif #include "virterror_internal.h" #include "datatypes.h" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org