41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
|
From 59d3e5b5ad6f0f33a9801bb69559d28efc62b4ce Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric DeVolder <eric.devolder@oracle.com>
|
||
|
|
Date: Fri, 7 Apr 2017 09:13:06 -0500
|
||
|
|
Subject: [PATCH 34/45] Fix broken Xen support in configure.ac
|
||
|
|
|
||
|
|
Commit 2cf7cb9a "kexec: implemented XEN KEXEC STATUS to determine
|
||
|
|
if an image is loaded" added configure-time detection of the
|
||
|
|
kexec_status() call, but in doing so had the unintended side
|
||
|
|
effect of disabling support for Xen altogether due to the
|
||
|
|
missing HAVE_LIBXENCTRL=1. This corrects the broken behavior
|
||
|
|
while still maintaining the original intention of detecting
|
||
|
|
support for kexec_status() call.
|
||
|
|
|
||
|
|
Reported-and-Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
|
||
|
|
Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
Signed-off-by: Simon Horman <horms@verge.net.au>
|
||
|
|
---
|
||
|
|
configure.ac | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 53fffc3a92ed..87a9ac8ccf88 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -165,9 +165,9 @@ fi
|
||
|
|
dnl find Xen control stack libraries
|
||
|
|
if test "$with_xen" = yes ; then
|
||
|
|
AC_CHECK_HEADER(xenctrl.h,
|
||
|
|
- [AC_CHECK_LIB(xenctrl, xc_kexec_load, [ have_xenctrl_h=yes ],
|
||
|
|
+ [AC_CHECK_LIB(xenctrl, xc_kexec_load, ,
|
||
|
|
AC_MSG_NOTICE([Xen support disabled]))])
|
||
|
|
- if test "$have_xenctrl_h" = yes ; then
|
||
|
|
+ if test "$ac_cv_lib_xenctrl_xc_kexec_load" = yes ; then
|
||
|
|
AC_CHECK_LIB(xenctrl, xc_kexec_status,
|
||
|
|
AC_DEFINE(HAVE_KEXEC_CMD_STATUS, 1,
|
||
|
|
[The kexec_status call is available]),
|
||
|
|
--
|
||
|
|
2.13.0
|
||
|
|
|