The --vmm configure option was added to distinguish between the two virtual
machine managers that kvm-unit-tests supports, qemu or kvmtool. There are
plans to make kvm-unit-tests work as an EFI app, which will require changes
to the way tests are compiled. Instead of adding a new configure option
specifically for EFI and have it coexist with --vmm, or overloading the
semantics of the existing --vmm option, let's replace --vmm with the more
generic name --target.
--vmm has been kept for now as to avoid breaking existing users, but it has
been modified to shadow value of --target and a message will be displayed
to notify users that it will be removed at some point in the future.
Signed-off-by: Alexandru Elisei <alexandru.elisei@xxxxxxx>
---
configure | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 01a0b262a9f2..71d6dc9490df 100755
--- a/configure
+++ b/configure
@@ -21,7 +21,8 @@ pretty_print_stacks=yes
environ_default=yes
u32_long=
wa_divide=
-vmm="qemu"
+vmm=
+target="qemu"
errata_force=0
erratatxt="$srcdir/errata.txt"
host_key_document=
@@ -35,8 +36,11 @@ usage() {
Options include:
--arch=ARCH architecture to compile for ($arch)
--processor=PROCESSOR processor to compile for ($arch)
- --vmm=VMM virtual machine monitor to compile for (qemu
- or kvmtool, default is qemu) (arm/arm64 only)
+ --target=TARGET target platform that the tests will be running on (qemu or
+ kvmtool, default is qemu) (arm/arm64 only)
+ --vmm=VMM virtual machine monitor to compile for (qemu or kvmtool).
+ If specified, it must have the same value as the --target
+ option (arm/arm64 only) (deprecated)
--cross-prefix=PREFIX cross compiler prefix
--cc=CC c compiler to use ($cc)
--ld=LD ld linker to use ($ld)
@@ -58,7 +62,7 @@ usage() {
--earlycon=EARLYCON
Specify the UART name, type and address (optional, arm and
arm64 only). The specified address will overwrite the UART
- address set by the --vmm option. EARLYCON can be one of
+ address set by the --target option. EARLYCON can be one of
(case sensitive):
uart[8250],mmio,ADDR
Specify an 8250 compatible UART at address ADDR. Supported
@@ -91,6 +95,9 @@ while [[ "$1" = -* ]]; do
--vmm)
vmm="$arg"
;;
+ --target)
+ target="$arg"
+ ;;
--cross-prefix)
cross_prefix="$arg"
;;
@@ -177,16 +184,24 @@ if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then
testdir=x86
elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
testdir=arm
- if [ "$vmm" = "qemu" ]; then
+ if [ "$target" = "qemu" ]; then
arm_uart_early_addr=0x09000000
- elif [ "$vmm" = "kvmtool" ]; then
+ elif [ "$target" = "kvmtool" ]; then
arm_uart_early_addr=0x3f8
errata_force=1
else
- echo '--vmm must be one of "qemu" or "kvmtool"!'
+ echo '--target must be one of "qemu" or "kvmtool"!'
usage
fi
+ if [ -n "$vmm" ]; then
+ echo "INFO: --vmm is deprecated and will be removed in future versions"
+ if [ "$vmm" != "$target" ]; then
+ echo "--vmm must have the same value as --target ($target)"
+ usage
+ fi
+ fi
+
if [ "$earlycon" ]; then
IFS=, read -r name type_addr addr <<<"$earlycon"
if [ "$name" != "uart" ] && [ "$name" != "uart8250" ] &&
@@ -317,6 +332,7 @@ U32_LONG_FMT=$u32_long
WA_DIVIDE=$wa_divide
GENPROTIMG=${GENPROTIMG-genprotimg}
HOST_KEY_DOCUMENT=$host_key_document
+TARGET=$target
EOF
cat <<EOF > lib/config.h
--
2.31.1
