From nobody Mon Feb 9 12:15:09 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608198718; cv=none; d=zohomail.com; s=zohoarc; b=mbR1M8bktsTaIqHy8WJb+UfQtlS5aekLy+vKx8yv8ALX8+p3wEYu6RuanbcYuhHjuERz0x6TcfcOO6O5iDa9al06eOUuM4h24vf82k732CS9K3m/UvZCYtPLv0PzYdkgWxnpsNt7JjxoBbH9c2bZYpOkIeGM0j3o6GMtIrBUp18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608198718; h=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=CoTdu9oftQn1Dqcp0qnrY06GwGq+xDV3ZKjVQ17RKzU=; b=Ws5HZSmoNX5ZsKvX6lnS6VEFwsDy9VFZ1phugZtXkKlHWXsVNZmv2p4wXvqNf7i3HFvTEpWdBKa/9bC7z8KnE+KdYb9vhPQHZ6ZpjRdgdA9tbvOR3Nx/7F3S/SEQ/psKjt1+Lssx3TgP6T/aV5GIE/WiU8oK5RhcUUJam8y1EeQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1608198718190900.8038861783942; Thu, 17 Dec 2020 01:51:58 -0800 (PST) Received: from localhost ([::1]:45460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kppwz-0007mW-2f for importer@patchew.org; Thu, 17 Dec 2020 04:51:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47850) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kppmZ-0004yd-MR for qemu-devel@nongnu.org; Thu, 17 Dec 2020 04:41:11 -0500 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:38965) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kppmS-0007n3-Cu for qemu-devel@nongnu.org; Thu, 17 Dec 2020 04:41:11 -0500 Received: by mail-ej1-x630.google.com with SMTP id n26so36889009eju.6 for ; Thu, 17 Dec 2020 01:41:03 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id rs27sm3463677ejb.21.2020.12.17.01.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Dec 2020 01:41:01 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=CoTdu9oftQn1Dqcp0qnrY06GwGq+xDV3ZKjVQ17RKzU=; b=WEBRK9xJnuVB/aAu8q4m2KOceDGnMYhm7V5zV1n0cbBcD7IPmgUtmEzzBcZtyQL28V FAGJXoDOfACAdnW6W1sQhwMJ8pK01lBluIXMcA2EQZgIfu8Q5XMxq+3vNmqDkZmdrszw kC8dOSrtXX7FQooe13MzjwbpSBXSPBTHvbEOL/aBGjhzTxGKCdFKJdJ+YtG88bWYjyLB 54XNhaI+3yDsaYIl1rPi154/Z4M1dRtLj/8y0/JUiFHW1dTHpAGW8IYVUxATbdcqbrqI 2We4q8kTPrA6Fd9z/1pAkdek4RJpO90FYKSLJoALJwKPkcSMikpg2y3tFdGNxGhyQd28 T8QQ== 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:mime-version:content-transfer-encoding; bh=CoTdu9oftQn1Dqcp0qnrY06GwGq+xDV3ZKjVQ17RKzU=; b=uA/2VSV+0dt9u3D3lgeN4dBTKj+sb6mHbp3GX5Gcxdto8qqgAT5SQ2ju4RSfSkj8yB w2S1rQBdQEqycK+mRjaZ2A9EZL4DjvtWWFRmWwQM0IZJWZlD+2/NamRIABspTs9QlTd9 yl22/ii2KPHfCjSizLTrbh9MEAY6+5OfBQzOsfucSe/V+RMuXRy1l9SULbiWu30fZWcx Z1Aig0zl3H1/iVF9p0kOK18WtN0v+y1DGkj08Q1jVmgYX7BHTIpz6vk4NuhBcw59cre5 bbeZMrbzxNzJuUOwK23aH9WVpSBifCkcFZ5DQFI4sIcSB6tJOt/IU1fvsDUZOlFN8GOY V7tw== X-Gm-Message-State: AOAM531+ILGb2m5/JWZcmWN+HjAdtYctbuartaG8Luj8ogVxV7MgKahE aHYTDZ15lMIhYmG28g3V1Tz2OwOOtWs= X-Google-Smtp-Source: ABdhPJxVkIr74xlcTmGVHGRssUy5CPwd66ApFTqsuO+5n72wZp4FlO9mJeMXWj8k+HEj8RY4TlAQ0g== X-Received: by 2002:a17:906:af75:: with SMTP id os21mr17722693ejb.330.1608198062400; Thu, 17 Dec 2020 01:41:02 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 18/18] meson.build: convert --with-default-devices to meson Date: Thu, 17 Dec 2020 10:40:44 +0100 Message-Id: <20201217094044.46462-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201217094044.46462-1-pbonzini@redhat.com> References: <20201217094044.46462-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::630; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x630.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Marc-Andr=C3=83=C2=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Pass the boolean option directly instead of writing CONFIG_MINIKCONF_MODE to config-host.mak. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- configure | 13 ++++--------- meson.build | 5 +++-- meson_options.txt | 2 ++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 420663d69a..ab4b826755 100755 --- a/configure +++ b/configure @@ -447,7 +447,7 @@ sheepdog=3D"no" libxml2=3D"$default_feature" debug_mutex=3D"no" libpmem=3D"$default_feature" -default_devices=3D"yes" +default_devices=3D"true" plugins=3D"no" fuzzing=3D"no" rng_none=3D"no" @@ -944,9 +944,9 @@ for opt do ;; --with-trace-file=3D*) trace_file=3D"$optarg" ;; - --with-default-devices) default_devices=3D"yes" + --with-default-devices) default_devices=3D"true" ;; - --without-default-devices) default_devices=3D"no" + --without-default-devices) default_devices=3D"false" ;; --without-default-features) # processed above ;; @@ -5541,11 +5541,6 @@ echo "GIT_UPDATE=3D$git_update" >> $config_host_mak =20 echo "ARCH=3D$ARCH" >> $config_host_mak =20 -if test "$default_devices" =3D "yes" ; then - echo "CONFIG_MINIKCONF_MODE=3D--defconfig" >> $config_host_mak -else - echo "CONFIG_MINIKCONF_MODE=3D--allnoconfig" >> $config_host_mak -fi if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi @@ -6498,7 +6493,7 @@ NINJA=3D$ninja $meson setup \ -Dlibnfs=3D$libnfs -Diconv=3D$iconv -Dcurses=3D$curses -Dlibudev= =3D$libudev\ -Dlibssh=3D$libssh -Drbd=3D$rbd -Dlzo=3D$lzo -Dsnappy=3D$snappy -D= lzfse=3D$lzfse \ -Dzstd=3D$zstd -Dseccomp=3D$seccomp -Dvirtfs=3D$virtfs -Dcap_ng=3D= $cap_ng \ - -Dattr=3D$attr \ + -Dattr=3D$attr -Ddefault_devices=3D$default_devices \ -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$b= lobs \ -Dvhost_user_blk_server=3D$vhost_user_blk_server \ -Dfuse=3D$fuse -Dfuse_lseek=3D$fuse_lseek \ diff --git a/meson.build b/meson.build index 341eadaa5c..4d331405e4 100644 --- a/meson.build +++ b/meson.build @@ -1276,7 +1276,8 @@ foreach target : target_dirs output: config_devices_mak, depfile: config_devices_mak + '.d', capture: true, - command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'], + command: [minikconf, + get_option('default_devices') ? '--defconfig' : '--allnoco= nfig', config_devices_mak, '@DEPFILE@', '@INPUT@', host_kconfig, accel_kconfig]) =20 @@ -2469,7 +2470,7 @@ summary_info +=3D {'capstone': capstone_opt = =3D=3D 'disabled' ? false : capst summary_info +=3D {'libpmem support': config_host.has_key('CONFIG_LIBPME= M')} summary_info +=3D {'libdaxctl support': config_host.has_key('CONFIG_LIBDAX= CTL')} summary_info +=3D {'libudev': libudev.found()} -summary_info +=3D {'default devices': config_host['CONFIG_MINIKCONF_MODE= '] =3D=3D '--defconfig'} +summary_info +=3D {'default devices': get_option('default_devices')} summary_info +=3D {'plugin support': config_host.has_key('CONFIG_PLUGIN= ')} summary_info +=3D {'fuzzing support': config_host.has_key('CONFIG_FUZZ')} if config_host.has_key('HAVE_GDB_BIN') diff --git a/meson_options.txt b/meson_options.txt index 8fcec056cd..1d4a71772e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,6 +7,8 @@ option('qemu_firmwarepath', type : 'string', value : '', option('sphinx_build', type : 'string', value : '', description: 'Use specified sphinx-build [$sphinx_build] for buildi= ng document (default to be empty)') =20 +option('default_devices', type : 'boolean', value : true, + description: 'Include a default selection of devices in emulators') option('docs', type : 'feature', value : 'auto', description: 'Documentations build support') option('gettext', type : 'feature', value : 'auto', --=20 2.29.2