From patchwork Tue Jul 4 11:11:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 783876 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x21dM0CZ3z9s7B for ; Tue, 4 Jul 2017 21:15:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="cFgR48JQ"; dkim-atps=neutral Received: from localhost ([::1]:40472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSLno-0000Jy-Lo for incoming@patchwork.ozlabs.org; Tue, 04 Jul 2017 07:15:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSLkp-0006Rd-D0 for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSLkn-0001le-Aa for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:27 -0400 Received: from mail-wm0-x22c.google.com ([2a00:1450:400c:c09::22c]:35130) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSLkn-0001lH-3U for qemu-devel@nongnu.org; Tue, 04 Jul 2017 07:12:25 -0400 Received: by mail-wm0-x22c.google.com with SMTP id w126so192597943wme.0 for ; Tue, 04 Jul 2017 04:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=YhGG6q8zyyd+1vyBsKHqkhSIp/rgqE6/RV4n6CnTfn8=; b=cFgR48JQWXVpf+vlKHb1F+BA4nVKYaDkSgcgkLNPmQCA61b5JIw7+dTyfgvb2Rub3S E4naHAp/UTb8DiQlf5aSD1MfsVIGghe8LdxVmYAS/fLZCwLg3qd5SvmMD751ponOVoRs FRXG26Nt/FopP+59PfUy7waOxmKqYY2j96VQGzYXJ1qIk8+pp/dOqZuHvCBnQGzNVnQN 2tyJ2qPR9bxk9UAceMQPRzbx8HeDG6Gsls7BZXSUCD9jTvRh5SaKnE/JeDxfS7AorUEi yB9RAI1fB0nEg+gbzHwTLv3ZsMeMrPHP3JkTbgt0lKn2w3lROsKBDnbIRwqgM7o/FJmS RVMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=YhGG6q8zyyd+1vyBsKHqkhSIp/rgqE6/RV4n6CnTfn8=; b=FluyCgsnM8A6U7u+jPArZhRsI6aMondi6VApJeSFFN4GW+qIN5hCcuW4JuezZfOYgx FCRNI+2ARJxj6qq0qMJLKZporsbisGlIbWSKCiiwA0IDgRJcl5bkztbe6bZXZG+YsNvY 5PwB55dlshYweDRPJ219ULCz+ln7RoZkHuLdvyENA1PnVP6/diOd5CM8Mrc9vBGIUq0Y zISTM3FUpuLzkreVB+AcXYsoClS/rRIVkvcUAD3IpqteIe3aoIZbXW+XoCHhYDvTyfr4 Ltmbbw+uJtbcpCftmSzNACCbdxd59BhpXXYif4j5iTx79LlscurUi1VRs7EQbJBojmyk /ZqA== X-Gm-Message-State: AKS2vOzSItagrW/FYbr+gddPPRLWaS1RtyVNh+oKtlQ9CBUVH0VDpwNK vokKhQgVm6xbHUC9+64= X-Received: by 10.28.51.212 with SMTP id z203mr29255019wmz.103.1499166743810; Tue, 04 Jul 2017 04:12:23 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id y5sm13613870wrd.52.2017.07.04.04.12.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jul 2017 04:12:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 4 Jul 2017 13:11:55 +0200 Message-Id: <1499166735-39360-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499166735-39360-1-git-send-email-pbonzini@redhat.com> References: <1499166735-39360-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22c Subject: [Qemu-devel] [PATCH 02/22] configure: early test for supported targets X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com, a.rigo@virtualopensystems.com, anthony.xu@intel.com, rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Check for unsupported targets in target_list, and print an error early in the configuration process. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrange --- 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" ;;