diff options
Diffstat (limited to 'main/libvirt/libvirt-0.10.2-legacy-xen-driver.patch')
-rw-r--r-- | main/libvirt/libvirt-0.10.2-legacy-xen-driver.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/main/libvirt/libvirt-0.10.2-legacy-xen-driver.patch b/main/libvirt/libvirt-0.10.2-legacy-xen-driver.patch deleted file mode 100644 index caf17aa793..0000000000 --- a/main/libvirt/libvirt-0.10.2-legacy-xen-driver.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Jim Fehlig <jfehlig@suse.com> -Date: Wed, 26 Sep 2012 21:20:35 +0000 (-0600) -Subject: Fix compilation of legacy xen driver with Xen 4.2 -X-Git-Url: http://libvirt.org/git/?p=libvirt.git;a=commitdiff_plain;h=416eca189b1934cfa8575ab72d142ec77600fcf9 - -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. ---- - -diff --git a/configure.ac b/configure.ac -index 38d94d4..ae26de7 100644 ---- a/configure.ac -+++ b/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 -diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c -index f3b756a..5ab1ce4 100644 ---- a/src/xen/block_stats.c -+++ b/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" -diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c -index 12efa0c..a91d409 100644 ---- a/src/xen/xs_internal.c -+++ b/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" |