From nobody Sat Apr 27 04:30:51 2024 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=1605858003; cv=none; d=zohomail.com; s=zohoarc; b=RDem4XfmUo7IQgOECL4YH6BUHogIgskblp3pxiKGuRVKuUui0YVHBRqQtizaE7IWGXasVfG8hknZ4Q1czM23tHe4veARij/w/zaZVWwtBjP7UJnwLaiEWHNgU8CDB8f3ehJnGBiCTIbPkdbggf651zFRprm82VRxniKj0wY0/3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605858003; h=Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=MR+VjmhSGvF16p1S4lZ4925k+WWyeToz2wI4OHvebOo=; b=SxAVmt8Ff/NWJlBI6CYvbsPtUd6qLdykAIuoB5lja1vigJO/RUmG3xpoI+//IehRmu5vXD8CfcIO6INP8EbkpUHvovGq6gldrPaf12AAO+cjkxF+aqtrrN1nHKhnjNLeyQKRu0ACW5qSjR6ZLFXe149uZBmeQ/JjOJB1rc0OlHk= 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 1605858003546230.2596514681585; Thu, 19 Nov 2020 23:40:03 -0800 (PST) Received: from localhost ([::1]:47906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kg11V-0000f9-GS for importer@patchew.org; Fri, 20 Nov 2020 02:40:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kg107-00008E-K6 for qemu-devel@nongnu.org; Fri, 20 Nov 2020 02:38:35 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:35098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kg106-0007em-0B for qemu-devel@nongnu.org; Fri, 20 Nov 2020 02:38:35 -0500 Received: by mail-ej1-x62b.google.com with SMTP id f23so11561144ejk.2 for ; Thu, 19 Nov 2020 23:38:33 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id y18sm782469ejq.69.2020.11.19.23.38.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:38:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=MR+VjmhSGvF16p1S4lZ4925k+WWyeToz2wI4OHvebOo=; b=RmwHFZ1sUpuLlxRy7Al6SwKoJqW8Evct3I4a9V/yO5XID2FuLQtq1YYw5EVVXk4o0O UNTbH8l6D/qxolciMinXyFah8wOwH9Ja+bX8IPwX0nItEyVeGqfFB5WWXkpPkUYWqj6X 1Xy8Ih7bn4BSnaPM1+3Y3xlUf7YRgm5GWrH/77MV1d0209aruDR0WAzHMn926y2L/dL8 ZpGL2lqFTbPk/XNzsiRIQemiF1IAOYEdpqMjSFWGHQlgZlHMgT6dt9+Kxy0PFskYS9us XnNw5W5stRXZ5htY8vo06CdV8sbzXc3Knao1YT17akqqVdTxxKcwcb24lz59OsY1aIty RcHQ== 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:subject:date:message-id :mime-version:content-transfer-encoding; bh=MR+VjmhSGvF16p1S4lZ4925k+WWyeToz2wI4OHvebOo=; b=CjtwV6HPjCfcz75LuVYoDAXkR2Www7XbsUydzuoXsKHCM5ViaL/NoyNx21nv0YNyED VwpdJMMyI+mC4tXSwrJHRiKnddDURjzF/2TuclFExqEL+UoMUOZUOwZMpOzBrVvGPZCC h1p3IS5YwZhJ4HPeOPeRKip8Ckdb6SXdVnLaR4eAPiEDzdaE+1WZAfYKAs0eN5xsHM2G Kv35xn/rJBrDVlQMWNw40+9Z3POW6ixh/ak/Gj6kEBnkTBt+vl/U5ihzW62MRljPni8w rqRTSptHXb4SgOrCZX0pZhhIUJd1p5SzXIByeaRou4v+UUE/odQVXFn8e8M71x1yXKCM IpIw== X-Gm-Message-State: AOAM532LQsGDtjeBVlDBQm8hSdwE3l4l9QXuXRu7Mz8IuApAb1TnXG+A oh2M4q9g/w1kL/0uPkbZ8CIb193XYPY= X-Google-Smtp-Source: ABdhPJyw+yeka4E32fuxtkpskB3+zHteVYWasL41Zq2vR5HE3DKbkcOP3U6cOBZfJs+4SYFtKY/i0A== X-Received: by 2002:a17:906:660b:: with SMTP id b11mr33882409ejp.190.1605857912073; Thu, 19 Nov 2020 23:38:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] meson.build: convert --with-default-devices to meson Date: Fri, 20 Nov 2020 08:38:30 +0100 Message-Id: <20201120073830.99939-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.28.0 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::62b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62b.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.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, 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: , 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 Reviewed-by: Richard Henderson --- configure | 12 ++++-------- meson.build | 5 +++-- meson_options.txt | 2 ++ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/configure b/configure index a3d13538c0..5e51279986 100755 --- a/configure +++ b/configure @@ -432,7 +432,7 @@ sheepdog=3D"no" libxml2=3D"" debug_mutex=3D"no" libpmem=3D"" -default_devices=3D"yes" +default_devices=3D"true" plugins=3D"no" fuzzing=3D"no" rng_none=3D"no" @@ -929,9 +929,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" ;; --enable-gprof) gprof=3D"yes" ;; @@ -5544,11 +5544,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 @@ -6527,6 +6522,7 @@ NINJA=3D$ninja $meson setup \ -Dattr=3D$attr \ -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$b= lobs \ -Dvhost_user_blk_server=3D$vhost_user_blk_server \ + -Ddefault_devices=3D$default_devices \ $cross_arg \ "$PWD" "$source_path" =20 diff --git a/meson.build b/meson.build index e968bb5ada..f273eb28ba 100644 --- a/meson.build +++ b/meson.build @@ -1206,7 +1206,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 @@ -2390,7 +2391,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 2f0ca97329..7d57b744ac 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 : 'boolean', value : true, --=20 2.28.0