From: Roger Pau Monne <roger.pau@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Wei Liu <wei.liu2@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH v2] pvshim: make PV shim build selectable from configure
Date: Tue, 14 May 2019 15:59:22 +0200 [thread overview]
Message-ID: <20190514135922.57629-1-roger.pau@citrix.com> (raw)
Message-ID: <20190514135922.koTKWDajLN81zmwNMFCZe95fdFCEjFy1m2kKi4k4PCQ@z> (raw)
So a user can decide whether to compile a PV shim as part of the tools
build. Note that the default behavior is preserved, which is to build
a PV shim when the target or host (if target is unset) architecture is
64bit x86.
Requested-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
NOTE: run autogen.sh after applying.
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
Changes since v1:
- Only enable by default on x86_64, like the previous behavior.
- Fallback to use host_cpu if target_cpu is empty.
---
config/Tools.mk.in | 2 ++
tools/configure.ac | 13 +++++++++++++
tools/firmware/Makefile | 4 ----
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 98245f63c9..84ddb1a542 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -75,3 +75,5 @@ TINFO_LIBS := @TINFO_LIBS@
ARGP_LDFLAGS := @argp_ldflags@
FILE_OFFSET_BITS := @FILE_OFFSET_BITS@
+
+CONFIG_PV_SHIM := @pvshim@
diff --git a/tools/configure.ac b/tools/configure.ac
index c9fd69ddfa..fcf282e74e 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -492,4 +492,17 @@ AC_ARG_ENABLE([9pfs],
AC_SUBST(ninepfs)
+AC_ARG_ENABLE([pvshim],
+ AS_HELP_STRING([--disable-pvshim],
+ [Disable pvshim build (enabled by default on 64bit x86)]),
+ [AS_IF([test "x$enable_pvshim" = "xno"], [pvshim=n], [pvshim=y])], [
+ cpu=`test -z "$target_cpu" && echo "$host_cpu" || echo "$target_cpu"`
+ case "$cpu" in
+ x86_64)
+ pvshim="y";;
+ *) pvshim="n";;
+ esac
+])
+AC_SUBST(pvshim)
+
AC_OUTPUT()
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index cf304fc578..809a5fd025 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -1,10 +1,6 @@
XEN_ROOT = $(CURDIR)/../..
include $(XEN_ROOT)/tools/Rules.mk
-ifneq ($(XEN_TARGET_ARCH),x86_32)
-CONFIG_PV_SHIM := y
-endif
-
# hvmloader is a 32-bit protected mode binary.
TARGET := hvmloader/hvmloader
INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR)
--
2.17.2 (Apple Git-113)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next reply other threads:[~2019-05-14 14:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-14 13:59 Roger Pau Monne [this message]
2019-05-14 13:59 ` [Xen-devel] [PATCH v2] pvshim: make PV shim build selectable from configure Roger Pau Monne
2019-05-14 14:03 ` Wei Liu
2019-05-14 14:03 ` [Xen-devel] " Wei Liu
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=20190514135922.57629-1-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.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).