From nobody Sun Nov 16 14:02:00 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=1600607550; cv=none; d=zohomail.com; s=zohoarc; b=doO+U637igd5EiyBe13pkyoKjVkLkjMWAPbCLksUM1gu7ziIRgNdfUZrf3PoTB/dBVQnhlPvFMQ/MQSAzJ91Gc5qHnJA5VLKOg2i69bfI7rFotev2EZj9cPZ7r/KWl4TwKYXUHhiFGHi/83yT6p9hUAAsebsRN+4MIOoQSQ1e8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600607550; h=Content-Type:Content-Transfer-Encoding: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=koaF4vwiRiino+Myf2s8wiU10e0a3K3aFmR+6h0MKKE=; b=ZucCUTgxU0EtImb0Dnuyfb/i4Cfu72p6SlLiaJ01lP1C7cxwtReeS3VhnVtox5FdfEwNFGS5NpmqdLsWAmZ+oo+xXu/aQ5WGXUQllxqvIwYMHFo3VrfmtQ50q8g6kV4xeFFQrx1Pnmvl06K2McSL+VGk7QKMSGXOdCJJ+2mvIe4= 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 1600607550951744.4329386420607; Sun, 20 Sep 2020 06:12:30 -0700 (PDT) Received: from localhost ([::1]:41502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kJz8n-0002ye-Lk for importer@patchew.org; Sun, 20 Sep 2020 09:12:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60096) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kJz3p-00069Q-Nc for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:21 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:58739 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kJz3k-00017W-IE for qemu-devel@nongnu.org; Sun, 20 Sep 2020 09:07:21 -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-292--buYI9DbMEe7b07riSuL2Q-1; Sun, 20 Sep 2020 09:07:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6011556B56 for ; Sun, 20 Sep 2020 13:07:10 +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 2F03160C47 for ; Sun, 20 Sep 2020 13:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600607233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=koaF4vwiRiino+Myf2s8wiU10e0a3K3aFmR+6h0MKKE=; b=dsQMx7aQRj/o8qOIJeN6IZ78lRDoHZ4xsIjRAtXGNUZqDaPCcIs7riVQxnXHjxizwBTXge IuHBC+qkBkWm5OmZNzXpWd7IPXFZcrB9KUZZ13ldJLi8IjMyKrhDwtifR/UVYEr5dMQHrA o5BUECM4U7AXFNkm+AcQU2ceHQHhVtw= X-MC-Unique: -buYI9DbMEe7b07riSuL2Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/9] configure: rewrite accelerator defaults as tests Date: Sun, 20 Sep 2020 09:07:02 -0400 Message-Id: <20200920130708.1156310-4-pbonzini@redhat.com> In-Reply-To: <20200920130708.1156310-1-pbonzini@redhat.com> References: <20200920130708.1156310-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/20 09:07:13 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.501, 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_H2=-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: , 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: localize the code that changes "auto" to enabled/disabled, it will be moved to meson and removed from configure. Signed-off-by: Paolo Bonzini --- configure | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/configure b/configure index ade456b7af..00348c2342 100755 --- a/configure +++ b/configure @@ -420,7 +420,7 @@ vhost_scsi=3D"" vhost_vsock=3D"" vhost_user=3D"" vhost_user_fs=3D"" -kvm=3D"disabled" +kvm=3D"auto" hax=3D"disabled" hvf=3D"disabled" whpx=3D"disabled" @@ -814,7 +814,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" @@ -849,7 +848,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" @@ -866,7 +864,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" @@ -903,7 +900,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 @@ -2664,6 +2660,28 @@ if test "$seccomp" !=3D "no" ; then seccomp=3D"no" fi fi + +########################################## +# simple accelerator probes + +if test "$kvm" =3D "auto" ; 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 + 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 --=20 2.26.2