From: Anthony PERARD <anthony.perard@citrix.com>
To: QEMU-devel <qemu-devel@nongnu.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Stefano Stabellini <stefano.stabellini@citrix.com>,
Xen Devel <xen-devel@lists.xen.org>
Subject: [Qemu-devel] [PATCH 2/2] xenstore: Use <xenstore.h>
Date: Fri, 15 Jun 2012 12:17:10 +0100 [thread overview]
Message-ID: <1339759030-32653-3-git-send-email-anthony.perard@citrix.com> (raw)
In-Reply-To: <1339759030-32653-1-git-send-email-anthony.perard@citrix.com>
In the next release of Xen (4.2), xs.h became deprecated.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
configure | 2 +-
hw/xen_common.h | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index c2366ee..e7f66c9 100755
--- a/configure
+++ b/configure
@@ -1382,7 +1382,7 @@ EOF
elif (
cat > $TMPC <<EOF
#include <xenctrl.h>
-#include <xs.h>
+#include <xenstore.h>
#include <stdint.h>
#include <xen/hvm/hvm_info_table.h>
#if !defined(HVM_MAX_VCPUS)
diff --git a/hw/xen_common.h b/hw/xen_common.h
index fe7f227..cc99204 100644
--- a/hw/xen_common.h
+++ b/hw/xen_common.h
@@ -7,7 +7,11 @@
#include <inttypes.h>
#include <xenctrl.h>
-#include <xs.h>
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
+# include <xs.h>
+#else
+# include <xenstore.h>
+#endif
#include <xen/io/xenbus.h>
#include "hw.h"
--
Anthony PERARD
next prev parent reply other threads:[~2012-06-15 11:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-15 11:17 [Qemu-devel] [PATCH 0/2] xen: Deprecation of <xs.h> Anthony PERARD
2012-06-15 11:17 ` [Qemu-devel] [PATCH 1/2] xen: Reorganize includes of Xen headers Anthony PERARD
2012-06-15 11:17 ` Anthony PERARD [this message]
2012-06-15 11:53 ` [Qemu-devel] [PATCH 2/2] xenstore: Use <xenstore.h> Juan Quintela
2012-06-15 12:24 ` Stefano Stabellini
2012-06-15 12:24 ` Anthony PERARD
2012-06-15 12:25 ` [Qemu-devel] [PATCH 0/2] xen: Deprecation of <xs.h> Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339759030-32653-3-git-send-email-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=qemu-devel@nongnu.org \
--cc=stefano.stabellini@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).