[Xen-changelog] [xen master] configure: #define SEABIOS_PATH and OVMF_PATH

[patchbot@xxxxxxx]

commit 1030baf09fb25b81a03b5792f2e4d059ce78f24b
Author:     Anthony PERARD <anthony.perard@xxxxxxxxxx>
AuthorDate: Mon Sep 28 19:03:55 2015 +0100
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Thu Aug 18 17:24:39 2016 +0100

    configure: #define SEABIOS_PATH and OVMF_PATH
    
    Those paths are to be used by libxl, in order to load the firmware in
    memory. If a system path is not defined via --with-system-seabios or
    --with-system-ovmf, then default to the Xen firmware directory.
    
    Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 tools/config.h.in  |  6 ++++++
 tools/configure    | 10 ++++++++++
 tools/configure.ac |  6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/tools/config.h.in b/tools/config.h.in
index 478a2cc..f65eec4 100644
--- a/tools/config.h.in
+++ b/tools/config.h.in
@@ -96,6 +96,9 @@
 /* libutil header file name */
 #undef INCLUDE_LIBUTIL_H
 
+/* OVMF path */
+#undef OVMF_PATH
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -117,6 +120,9 @@
 /* Qemu Xen path */
 #undef QEMU_XEN_PATH
 
+/* SeaBIOS path */
+#undef SEABIOS_PATH
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
diff --git a/tools/configure b/tools/configure
index 51f16c5..c182391 100755
--- a/tools/configure
+++ b/tools/configure
@@ -4451,6 +4451,11 @@ fi
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define SEABIOS_PATH "${seabios_path:-$XENFIRMWAREDIR/bios.bin}"
+_ACEOF
+
+
 
 # Check whether --with-system-ovmf was given.
 if test "${with_system_ovmf+set}" = set; then :
@@ -4464,6 +4469,11 @@ fi
 
 
 
+cat >>confdefs.h <<_ACEOF
+#define OVMF_PATH "${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"
+_ACEOF
+
+
 
 # Check whether --with-extra-qemuu-configure-args was given.
 if test "${with_extra_qemuu_configure_args+set}" = set; then :
diff --git a/tools/configure.ac b/tools/configure.ac
index 3a4abb5..ed10902 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -221,6 +221,9 @@ AC_ARG_WITH([system-seabios],
     esac
 ],[])
 AC_SUBST(seabios_path)
+AC_DEFINE_UNQUOTED([SEABIOS_PATH],
+                   ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"],
+                   [SeaBIOS path])
 
 AC_ARG_WITH([system-ovmf],
     AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@],
@@ -232,6 +235,9 @@ AC_ARG_WITH([system-ovmf],
     esac
 ],[])
 AC_SUBST(ovmf_path)
+AC_DEFINE_UNQUOTED([OVMF_PATH],
+                   ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"],
+                   [OVMF path])
 
 AC_ARG_WITH([extra-qemuu-configure-args],
     AS_HELP_STRING([--with-extra-qemuu-configure-args@<:@="--ARG1 ..."@:>@],
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog