From nobody Sun Nov 16 16:27:25 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600852582; cv=none; d=zohomail.com; s=zohoarc; b=FAxSlB6fUnJxUXKrwjMcQDAdwAH1p0dDJJWY/4PJs4ZJnNfiecp5QzxoFTaXXH3SmfTf7lJ+WNyAxWSeNQgZUkfKrcP8exMnGZwSVDsTBmmMYD28nIBFATa0qV7xqWtVF9zDIzJOsQJd8QBmTWiZ6IS+jtDKwa/2RLa9+th8YUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852582; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=NmGhtkB1QB5kLHSLDrmo5u7rX3bh1zscfyeedYPRWx4=; b=ghFLeypI5anDcT7NUlON/K9J+akYECG/2T+PFnLY6l5SKnOmc2+9tr4gi5pKvf3ZK1M2Qv6DzDXY9bC2yZr8w9EH2RmZIHLKyOyHsgcIQPYxc19bHnPmM8nl8jxzx+apkaucgDzwNjYkD1eDYOTJrnOS/aXaCEyfku/S7ahMyNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1600852582404966.4343958120688; Wed, 23 Sep 2020 02:16:22 -0700 (PDT) Received: from localhost ([::1]:40320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kL0sv-00084G-3p for importer@patchew.org; Wed, 23 Sep 2020 05:16:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kL0oS-00019H-6L for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59387) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kL0oL-0002Mb-FK for qemu-devel@nongnu.org; Wed, 23 Sep 2020 05:11:41 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-07791cbYMxSbHCZovwdVtQ-1; Wed, 23 Sep 2020 05:11:35 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07D6F107464E; Wed, 23 Sep 2020 09:11:34 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0BF75D9CC; Wed, 23 Sep 2020 09:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NmGhtkB1QB5kLHSLDrmo5u7rX3bh1zscfyeedYPRWx4=; b=ElHJ+OuE2mfdtm9aqcFwkYOnrO42O/+0x6DNO3r6wwurqYf4ixOclizJnVm6UpsErhd2WO I9qiZ2/vdi/IPdn1UyAXAFzp21xd1g7hJz3RHfzjAnYHgf0q4veLScUW1d95ahX7HgPfUY xNx9phCc+zFCmLLe1qBg90e3UQEcN2U= X-MC-Unique: 07791cbYMxSbHCZovwdVtQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/12] configure: rewrite accelerator defaults as tests Date: Wed, 23 Sep 2020 05:11:22 -0400 Message-Id: <20200923091131.1591563-4-pbonzini@redhat.com> In-Reply-To: <20200923091131.1591563-1-pbonzini@redhat.com> References: <20200923091131.1591563-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/23 00:53:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Prepare to process "auto" in meson rather than configure: standardize the shape of the code that changes "auto" to enabled/disabled, to ease the revi= ew when it will be moved to meson. Signed-off-by: Paolo Bonzini --- configure | 58 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 33bd3c4cb8..04cc25f7c8 100755 --- a/configure +++ b/configure @@ -429,10 +429,10 @@ vhost_scsi=3D"" vhost_vsock=3D"" vhost_user=3D"" vhost_user_fs=3D"" -kvm=3D"disabled" -hax=3D"disabled" -hvf=3D"disabled" -whpx=3D"disabled" +kvm=3D"auto" +hax=3D"auto" +hvf=3D"auto" +whpx=3D"auto" rdma=3D"" pvrdma=3D"" gprof=3D"no" @@ -821,8 +821,6 @@ HOST_VARIANT_DIR=3D"" case $targetos in MINGW32*) mingw32=3D"yes" - hax=3D"enabled" - whpx=3D"auto" vhost_user=3D"no" audio_possible_drivers=3D"dsound sdl" if check_include dsound.h; then @@ -856,7 +854,6 @@ DragonFly) ;; NetBSD) bsd=3D"yes" - hax=3D"enabled" make=3D"${MAKE-gmake}" audio_drv_list=3D"oss try-sdl" audio_possible_drivers=3D"oss sdl" @@ -873,8 +870,6 @@ OpenBSD) Darwin) bsd=3D"yes" darwin=3D"yes" - hax=3D"enabled" - hvf=3D"auto" if [ "$cpu" =3D "x86_64" ] ; then QEMU_CFLAGS=3D"-arch x86_64 $QEMU_CFLAGS" QEMU_LDFLAGS=3D"-arch x86_64 $QEMU_LDFLAGS" @@ -910,7 +905,6 @@ Linux) audio_possible_drivers=3D"oss alsa sdl pa" linux=3D"yes" linux_user=3D"yes" - kvm=3D"enabled" QEMU_INCLUDES=3D"-isystem ${source_path}/linux-headers -Ilinux-headers $= QEMU_INCLUDES" ;; esac @@ -2668,6 +2662,29 @@ if test "$seccomp" !=3D "no" ; then seccomp=3D"no" fi fi + +########################################## +# simple accelerator probes + +if test "$kvm" !=3D "disabled" ; then + if test "$linux" =3D yes ; then + kvm=3Denabled + else + if test "$kvm" =3D "enabled" ; then + feature_not_found "kvm" "KVM is only available on Linux" + fi + kvm=3Ddisabled + fi +fi + +if test "$hax" =3D "auto" ; then + if test "$mingw" =3D yes || test "$darwin" =3D yes || test "$targetos" = =3D NetBSD; then + hax=3Denabled + else + hax=3Ddisabled + fi +fi + ########################################## # xen probe =20 @@ -2988,14 +3005,15 @@ fi =20 ########################################## # Windows Hypervisor Platform accelerator (WHPX) check -if test "$whpx" =3D "enabled" && test "$ARCH" !=3D "x86_64"; then - error_exit "WHPX requires 64-bit host" -fi -if test "$whpx" !=3D "disabled" && test "$ARCH" =3D "x86_64"; then - if check_include "WinHvPlatform.h" && check_include "WinHvEmulation.h"= ; then - whpx=3D"yes" +if test "$whpx" !=3D "disabled"; then + if test "$mingw32" =3D yes && test "$ARCH" =3D "x86_64" && + check_include "WinHvPlatform.h" && check_include "WinHvEmulati= on.h"; then + whpx=3D"enabled" else - if test "$whpx" =3D "auto"; then + if test "$whpx" =3D "enabled"; then + if test "$ARCH" !=3D "x86_64"; then + error_exit "WHPX requires 64-bit host" + fi feature_not_found "WinHvPlatform" "WinHvEmulation is not insta= lled" fi whpx=3D"disabled" @@ -5831,13 +5849,13 @@ if [ "$hvf" !=3D "disabled" ] ; then #include int main() { return 0;} EOF - if ! compile_object ""; then + if test "$darwin" =3D yes && compile_object ""; then + hvf=3D'enabled' + else if test "$hvf" =3D "enabled"; then error_exit "Hypervisor.framework not available" fi hvf=3D'disabled' - else - hvf=3D'enabled' fi fi =20 --=20 2.26.2