[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/22] configure: early test for supported targets
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 02/22] configure: early test for supported targets |
Date: |
Tue, 4 Jul 2017 13:11:55 +0200 |
Check for unsupported targets in target_list, and print an
error early in the configuration process.
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
v2: place ;; on a separate line [Daniel]
configure | 70 +++++++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 48 insertions(+), 22 deletions(-)
diff --git a/configure b/configure
index 0f14e79..ae69e96 100755
--- a/configure
+++ b/configure
@@ -40,14 +40,18 @@ printf " '%s'" "$0" "$@" >> config.log
echo >> config.log
echo "#" >> config.log
-error_exit() {
- echo
+print_error() {
+ (echo
echo "ERROR: $1"
while test -n "$2"; do
echo " $2"
shift
done
- echo
+ echo) >&2
+}
+
+error_exit() {
+ print_error "$@"
exit 1
}
@@ -207,6 +211,30 @@ supported_xen_target() {
return 1
}
+supported_target() {
+ case "$1" in
+ *-softmmu)
+ ;;
+ *-linux-user)
+ if test "$linux" != "yes"; then
+ print_error "Target '$target' is only available on a Linux
host"
+ return 1
+ fi
+ ;;
+ *-bsd-user)
+ if test "$bsd" != "yes"; then
+ print_error "Target '$target' is only available on a BSD host"
+ return 1
+ fi
+ ;;
+ *)
+ print_error "Invalid target name '$target'"
+ return 1
+ ;;
+ esac
+ return 0
+}
+
# default parameters
source_path=$(dirname "$0")
cpu=""
@@ -1734,23 +1762,27 @@ if test "$solaris" = "yes" ; then
fi
if test -z "${target_list+xxx}" ; then
- target_list="$default_target_list"
+ for target in $default_target_list; do
+ supported_target $target 2>/dev/null && \
+ target_list="$target_list $target"
+ done
+ target_list="${target_list# }"
else
target_list=$(echo "$target_list" | sed -e 's/,/ /g')
+ for target in $target_list; do
+ # Check that we recognised the target name; this allows a more
+ # friendly error message than if we let it fall through.
+ case " $default_target_list " in
+ *" $target "*)
+ ;;
+ *)
+ error_exit "Unknown target name '$target'"
+ ;;
+ esac
+ supported_target $target || exit 1
+ done
fi
-# Check that we recognised the target name; this allows a more
-# friendly error message than if we let it fall through.
-for target in $target_list; do
- case " $default_target_list " in
- *" $target "*)
- ;;
- *)
- error_exit "Unknown target name '$target'"
- ;;
- esac
-done
-
# see if system emulation was really requested
case " $target_list " in
*"-softmmu "*) softmmu=yes
@@ -6050,16 +6082,10 @@ case "$target" in
target_softmmu="yes"
;;
${target_name}-linux-user)
- if test "$linux" != "yes" ; then
- error_exit "Target '$target' is only available on a Linux host"
- fi
target_user_only="yes"
target_linux_user="yes"
;;
${target_name}-bsd-user)
- if test "$bsd" != "yes" ; then
- error_exit "Target '$target' is only available on a BSD host"
- fi
target_user_only="yes"
target_bsd_user="yes"
;;
--
1.8.3.1
- [Qemu-devel] [PATCH v4 00/22] add disable-tcg option for x86 build, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 03/22] configure: add --disable-tcg configure option, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 02/22] configure: early test for supported targets,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 04/22] vl: convert -tb-size to qemu_strtoul, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 01/22] configure: factor out list of supported Xen/KVM/HAX targets, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 06/22] tcg: move page_size_init() function, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 05/22] vl: add tcg_enabled() for tcg related code, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 07/22] tcg: tcg_handle_interrupt() function, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 08/22] tcg: make tcg_allowed global, Paolo Bonzini, 2017/07/04
- [Qemu-devel] [PATCH 09/22] monitor: disable "info jit" and "info opcount" if !TCG, Paolo Bonzini, 2017/07/04