diff mbox

[v3,03/16] configure: #define SEABIOS_PATH and OVMF_PATH

Message ID 1456412174-20162-4-git-send-email-anthony.perard@citrix.com (mailing list archive)
State New, archived
Headers show

Commit Message

Anthony PERARD Feb. 25, 2016, 2:56 p.m. UTC
Those paths are to be used by libxl, in order to load the firmware in
memory. If a system path is not define, then this default to the Xen
firmware directory.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

---
Please, run ./autogen.sh on this patch.
---
 tools/configure.ac | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Wei Liu March 1, 2016, 11:51 a.m. UTC | #1
On Thu, Feb 25, 2016 at 02:56:01PM +0000, Anthony PERARD wrote:
> Those paths are to be used by libxl, in order to load the firmware in
> memory. If a system path is not define, then this default to the Xen
> firmware directory.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> 

There is already --with-system-seabios and --with-system-ovmf that you
can use.

Wei.
Anthony PERARD March 3, 2016, 5:03 p.m. UTC | #2
On Tue, Mar 01, 2016 at 11:51:36AM +0000, Wei Liu wrote:
> On Thu, Feb 25, 2016 at 02:56:01PM +0000, Anthony PERARD wrote:
> > Those paths are to be used by libxl, in order to load the firmware in
> > memory. If a system path is not define, then this default to the Xen
> > firmware directory.
> > 
> > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> > 
> 
> There is already --with-system-seabios and --with-system-ovmf that you
> can use.

The path generated by --with-system-seabios is only for the benefit of the
Makefiles. With this patch, I'm exporting the value to the .c files. And in
the case where --with-system-* is not used, it provide a default path to
where we are going to install the firmware we compiled.
Wei Liu March 8, 2016, 3:55 p.m. UTC | #3
On Thu, Mar 03, 2016 at 05:03:00PM +0000, Anthony PERARD wrote:
> On Tue, Mar 01, 2016 at 11:51:36AM +0000, Wei Liu wrote:
> > On Thu, Feb 25, 2016 at 02:56:01PM +0000, Anthony PERARD wrote:
> > > Those paths are to be used by libxl, in order to load the firmware in
> > > memory. If a system path is not define, then this default to the Xen
> > > firmware directory.
> > > 
> > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> > > 
> > 
> > There is already --with-system-seabios and --with-system-ovmf that you
> > can use.
> 
> The path generated by --with-system-seabios is only for the benefit of the
> Makefiles. With this patch, I'm exporting the value to the .c files. And in
> the case where --with-system-* is not used, it provide a default path to
> where we are going to install the firmware we compiled.
> 

I see. SEABIOS_PATH and OVMF_PATH are already defined in Tools.mk.in.
This approach is fine then.

Wei.

> -- 
> Anthony PERARD
diff mbox

Patch

diff --git a/tools/configure.ac b/tools/configure.ac
index 6c70040..6929006 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -212,6 +212,9 @@  AC_ARG_WITH([system-seabios],
     esac
 ],[])
 AC_SUBST(seabios_path)
+AC_DEFINE_UNQUOTED([SEABIOS_PATH],
+                   ["${seabios_path:-$XENFIRMWAREDIR/seabios.bin}"],
+                   [SeaBIOS path])
 
 AC_ARG_WITH([system-ovmf],
     AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@],
@@ -223,6 +226,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 ..."@:>@],