- Fix build when using -werror

416eca18-xenstore-header-fix.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=231

416eca18-xenstore-header-fix.patch

@@ -0,0 +1,64 @@
+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"

libvirt.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

libvirt.spec

@@ -412,6 +412,7 @@ 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
@@ -548,6 +549,7 @@ Authors:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch100 -p1
 %patch101
 %patch102 -p1