blob: caf17aa793bb5995716f3ddb671778e04f6c8a8d (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
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"
|
