61 lines
1.8 KiB
Diff
61 lines
1.8 KiB
Diff
From 85f61ad8c70b51e541745503d650d0e628809c17 Mon Sep 17 00:00:00 2001
|
|
From: Paul Durrant <paul.durrant@citrix.com>
|
|
Date: Tue, 7 Mar 2017 10:55:33 +0000
|
|
Subject: [PATCH 4/6] configure: detect presence of libxendevicemodel
|
|
|
|
This patch adds code in configure to set CONFIG_XEN_CTRL_INTERFACE_VERSION
|
|
to a new value of 490 if libxendevicemodel is present in the build
|
|
environment.
|
|
|
|
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
|
|
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
Reviewed-by: Anthony Perard <anthony.perard@citrix.com>
|
|
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
|
|
(cherry picked from commit da8090ccb7735aed5a46ce27dfbe8486cfce61f5)
|
|
---
|
|
configure | 21 ++++++++++++++++++++-
|
|
1 file changed, 20 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/configure b/configure
|
|
index be4d326ae0..092cb7359d 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -1989,7 +1989,7 @@ fi
|
|
|
|
if test "$xen" != "no" ; then
|
|
xen_libs="-lxenstore -lxenctrl -lxenguest"
|
|
- xen_stable_libs="-lxenforeignmemory -lxengnttab -lxenevtchn"
|
|
+ xen_stable_libs="-lxencall -lxenforeignmemory -lxengnttab -lxenevtchn"
|
|
|
|
# First we test whether Xen headers and libraries are available.
|
|
# If no, we are done and there is no Xen support.
|
|
@@ -2012,6 +2012,25 @@ EOF
|
|
# Xen unstable
|
|
elif
|
|
cat > $TMPC <<EOF &&
|
|
+#undef XC_WANT_COMPAT_DEVICEMODEL_API
|
|
+#define __XEN_TOOLS__
|
|
+#include <xendevicemodel.h>
|
|
+int main(void) {
|
|
+ xendevicemodel_handle *xd;
|
|
+
|
|
+ xd = xendevicemodel_open(0, 0);
|
|
+ xendevicemodel_close(xd);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+EOF
|
|
+ compile_prog "" "$xen_libs -lxendevicemodel $xen_stable_libs"
|
|
+ then
|
|
+ xen_stable_libs="-lxendevicemodel $xen_stable_libs"
|
|
+ xen_ctrl_version=490
|
|
+ xen=yes
|
|
+ elif
|
|
+ cat > $TMPC <<EOF &&
|
|
/*
|
|
* If we have stable libs the we don't want the libxc compat
|
|
* layers, regardless of what CFLAGS we may have been given.
|
|
--
|
|
2.13.0
|
|
|