From patchwork Tue Dec 21 11:05:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1571581 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=bgaJaMzJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJDCl6W5Sz9sCD for ; Tue, 21 Dec 2021 22:06:10 +1100 (AEDT) Received: from localhost ([::1]:52602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzcy6-0005K9-RL for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 06:06:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzcxa-0005Ji-K2 for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:34 -0500 Received: from [2a00:1450:4864:20::42a] (port=43849 helo=mail-wr1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzcxY-0004yW-2M for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:34 -0500 Received: by mail-wr1-x42a.google.com with SMTP id v11so26094173wrw.10 for ; Tue, 21 Dec 2021 03:05:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=scKI0XUojemkNwM+Uk5vdVFq+/YXr2F98gMRbX8fEAY=; b=bgaJaMzJjszJKEE2TiXpcPxZjCoAtjKzfKUbHIcWq/NwqTH59TzQSubLj5GQz6pWBk q0Yzp7BxWQvJd8Ivg2tHROeg4VGUaNmEUaXjCGX2jFXIjDlaoc8ztXeK1ziUhvYaqOxd Rj5N4oCwHfKnAYp9GmhKaCp2l7b42HH+2S/ECSh67ysfQPnZivV3dcYw9xBExLIjLj+U q/xB4q8vcKVgAZWXQoQMlDdLba/HS2q3Y0cCgSQod2yyc6b+1jCpasoyeyvoRbDFLmpC GS4V6wd7ypzQxZqFCttcR3+4KB2dbZMol7ijuzThN6AKNp/nEZzf3mWmVnCeT+ocCUjJ XgqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=scKI0XUojemkNwM+Uk5vdVFq+/YXr2F98gMRbX8fEAY=; b=r90d8bFJCbOe6kp4+RyeuX5nXzv52B5F/Ktddctuy1yIMpHJ33pgVNlQZWqfC6DJoq sPbKxv4EuJVHxu37FbPM8NjkQ2xjWp11NL8xW53Cb1Cijjil3WMmuQYY4wAPz9J0Qxvi SVPARYNuwqcpEBSlb7g8IofwN00uB76i+pSRvCP9dCGdszBopx0/hUyxpeL7sqSL/NBX R7hhD0y0HyPeP1/l0QDUUjS8aUbPzF5zS4lghZwCFeoPd3zMWWXCdzEQ+ns/ogremtiz a7jaHnunUErA1T3zMFVqK9DRHtP4XIWT+XGbSEFlD1H/5dYOM6BozSxjfkuBU+VQf8yw aBbw== X-Gm-Message-State: AOAM530KAu2p6VqChPvQwkfpNYbNEQxHa1jkDFMhdoUkrQ2JcMcgRqEg Ba529yFNOhmmY59nBVnSg1A5HaojqYg= X-Google-Smtp-Source: ABdhPJw2vsg2e4zH6tJMzu3rFpvWnyFntEI5e43vRn4W7w6f1j84v3jq2weOpYeeWFH7XxoCQu9r7g== X-Received: by 2002:a05:6000:1885:: with SMTP id a5mr1417838wri.301.1640084730756; Tue, 21 Dec 2021 03:05:30 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id az11sm1949444wmb.30.2021.12.21.03.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 03:05:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/8] configure: simplify creation of plugin symbol list Date: Tue, 21 Dec 2021 12:05:19 +0100 Message-Id: <20211221110526.351709-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com> References: <20211221110526.351709-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" --dynamic-list is present on all supported ELF (not Windows or Darwin) platforms, since it dates back to 2006; -exported_symbols_list is likewise present on all supported versions of macOS. Do not bother doing a functional test in configure. Remove the file creation from configure as well: for Darwin, move the the creation of the Darwin-formatted symbols to meson; for ELF, use the file in the source path directly and switch from -Wl, to -Xlinker to not break weird paths that include a comma. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 80 --------------------------------------------- plugins/meson.build | 11 +++++-- 2 files changed, 8 insertions(+), 83 deletions(-) diff --git a/configure b/configure index 8ccfe51673..1bce9635d9 100755 --- a/configure +++ b/configure @@ -78,7 +78,6 @@ TMPC="${TMPDIR1}/${TMPB}.c" TMPO="${TMPDIR1}/${TMPB}.o" TMPCXX="${TMPDIR1}/${TMPB}.cxx" TMPE="${TMPDIR1}/${TMPB}.exe" -TMPTXT="${TMPDIR1}/${TMPB}.txt" rm -f config.log @@ -2343,69 +2342,6 @@ EOF fi fi -########################################## -# plugin linker support probe - -if test "$plugins" != "no"; then - - ######################################### - # See if --dynamic-list is supported by the linker - - ld_dynamic_list="no" - cat > $TMPTXT < $TMPC < -void foo(void); - -void foo(void) -{ - printf("foo\n"); -} - -int main(void) -{ - foo(); - return 0; -} -EOF - - if compile_prog "" "-Wl,--dynamic-list=$TMPTXT" ; then - ld_dynamic_list="yes" - fi - - ######################################### - # See if -exported_symbols_list is supported by the linker - - ld_exported_symbols_list="no" - cat > $TMPTXT <> $config_host_mak - # Copy the export object list to the build dir - if test "$ld_dynamic_list" = "yes" ; then - echo "CONFIG_HAS_LD_DYNAMIC_LIST=yes" >> $config_host_mak - ld_symbols=qemu-plugins-ld.symbols - cp "$source_path/plugins/qemu-plugins.symbols" $ld_symbols - elif test "$ld_exported_symbols_list" = "yes" ; then - echo "CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST=yes" >> $config_host_mak - ld64_symbols=qemu-plugins-ld64.symbols - echo "# Automatically generated by configure - do not modify" > $ld64_symbols - grep 'qemu_' "$source_path/plugins/qemu-plugins.symbols" | sed 's/;//g' | \ - sed -E 's/^[[:space:]]*(.*)/_\1/' >> $ld64_symbols - else - error_exit \ - "If \$plugins=yes, either \$ld_dynamic_list or " \ - "\$ld_exported_symbols_list should have been set to 'yes'." - fi fi if test -n "$gdb_bin"; then diff --git a/plugins/meson.build b/plugins/meson.build index b3de57853b..d0a2ee94cf 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,10 +1,15 @@ plugin_ldflags = [] # Modules need more symbols than just those in plugins/qemu-plugins.symbols if not enable_modules - if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host - plugin_ldflags = ['-Wl,--dynamic-list=qemu-plugins-ld.symbols'] - elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host + if targetos == 'darwin' + qemu_plugins_symbols_list = configure_file( + input: files('qemu-plugins.symbols'), + output: 'qemu-plugins-ld64.symbols', + capture: true, + command: ['sed', '-ne', 's/^[[:space:]]*\\(qemu_.*\\);/_\\1/p', '@INPUT@']) plugin_ldflags = ['-Wl,-exported_symbols_list,qemu-plugins-ld64.symbols'] + else + plugin_ldflags = ['-Xlinker', '--dynamic-list=' + (meson.project_source_root() / 'plugins/qemu-plugins.symbols')] endif endif From patchwork Tue Dec 21 11:05:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1571580 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=XNuzDPZu; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJDCl6GcVz9s0r for ; Tue, 21 Dec 2021 22:06:10 +1100 (AEDT) Received: from localhost ([::1]:52628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzcy8-0005MJ-6m for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 06:06:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzcxb-0005Jz-AX for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:35 -0500 Received: from [2a00:1450:4864:20::32e] (port=40578 helo=mail-wm1-x32e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzcxY-0004yn-SB for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:35 -0500 Received: by mail-wm1-x32e.google.com with SMTP id j140-20020a1c2392000000b003399ae48f58so1388937wmj.5 for ; Tue, 21 Dec 2021 03:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SwquXMcRtP+JeTEQ8y9DI2JPbN/svif4Xsndrbgrh6A=; b=XNuzDPZurRWN7rnH6gOdhPuTDtXkfmT/LqY8JLOWHPeK1Bsh0pFcPs5SLqN9Hx9KNJ FGJuwICRAZ+K+ZFEy4y/U/hxjv7o4CQcrqnlMl/Ci2xxguylfR8qXV17QTiQK9rFVd/Q C6nHa/lnA+IBWT4q0JfXVS/C7p9unSY8COykf8cfTtLzxN19BJKAywW3K8aM0XDPMyut v0sMCphlRgrSm0FG9I4ryREJhl91gYFcn0ERuzYYP+dpS5/6ed6luRbMj4C6GVEvDtqY CLHH9wIYfmpRrKv+SM1Qd0Ez7IYpTCD0FfaGSz4r77Gs5oD4NfqsBzGw8j7DxG7JqG3q Bh2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SwquXMcRtP+JeTEQ8y9DI2JPbN/svif4Xsndrbgrh6A=; b=w+yFT+EeQetbI7UjaIXqXxjLMaO1w3HASMuTFliKeWGZWRDw6tYyaCNljJHUzH6sew 7VEfTn+xBL5JHhqigpXZOnnd1OJh/jgICqPGWdlrg/85K0bdiuUIhAhSOAiRaf9Pe/Tb 3f7JTkdoTfESLzxsGjp5HSOAyXDVexoyXI1/zEikMJ+wHlf70wpLQr+R5Cduo8ZYsWCm TdYTFzlW2Ywr29PfV5Vzy5b2cT+Qs5qItLOsCxDvYav3fd/gHOEe8uood9HH6weICfIK vq/iQ/sAVvMsdjBiCTM+7Qs2UWoLBfTMJKQqIdyddPZlXiX8Oc0wo6/cX6Ebksy0K7d8 1FXw== X-Gm-Message-State: AOAM531YQ2tQ3z/WJ4KEjpE5TDJsvVRzRg5TVDwG84x+HylU2AhCwCO5 TuCbOgI9dfplGrcNKbRDfqO/PdtzfNg= X-Google-Smtp-Source: ABdhPJyMWBFwMifGMV6EczmF8ZBGfpot72ApJ9el6tIpIDCQRRNt8Tqe1fn461IsLcPSFM7onoMBVg== X-Received: by 2002:a1c:f005:: with SMTP id a5mr2346016wmb.19.1640084731335; Tue, 21 Dec 2021 03:05:31 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id az11sm1949444wmb.30.2021.12.21.03.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 03:05:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/8] configure: do not set bsd_user/linux_user early Date: Tue, 21 Dec 2021 12:05:20 +0100 Message-Id: <20211221110526.351709-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com> References: <20211221110526.351709-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Similar to other optional features, leave the variables empty and compute the actual value later. Use the existence of include or source directories to detect whether an OS or CPU supports respectively bsd-user and linux-user. For now, BSD user-mode emulation is buildable even on TCI-only architectures. This probably will change once safe signals are brought over from linux-user. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 1bce9635d9..6dafbcd362 100755 --- a/configure +++ b/configure @@ -321,8 +321,8 @@ linux="no" solaris="no" profiler="no" softmmu="yes" -linux_user="no" -bsd_user="no" +linux_user="" +bsd_user="" pkgversion="" pie="" qom_cast_debug="yes" @@ -539,7 +539,6 @@ gnu/kfreebsd) ;; freebsd) bsd="yes" - bsd_user="yes" make="${MAKE-gmake}" # needed for kinfo_getvmmap(3) in libutil.h ;; @@ -584,7 +583,6 @@ haiku) ;; linux) linux="yes" - linux_user="yes" vhost_user=${default_feature:-yes} ;; esac @@ -1262,18 +1260,26 @@ if eval test -z "\${cross_cc_$cpu}"; then cross_cc_vars="$cross_cc_vars cross_cc_${cpu}" fi -# For user-mode emulation the host arch has to be one we explicitly -# support, even if we're using TCI. -if [ "$ARCH" = "unknown" ]; then - bsd_user="no" - linux_user="no" -fi - default_target_list="" deprecated_targets_list=ppc64abi32-linux-user deprecated_features="" mak_wilds="" +if [ "$linux_user" != no ]; then + if [ "$targetos" = linux ] && [ -d $source_path/linux-user/host/$cpu ]; then + linux_user=yes + elif [ "$linux_user" = yes ]; then + error_exit "linux-user not supported on this architecture" + fi +fi +if [ "$bsd_user" != no ]; then + if [ "$bsd_user" = "" ]; then + test $targetos = freebsd && bsd_user=yes + fi + if [ "$bsd_user" = yes ] && ! [ -d $source_path/bsd-user/$targetos ]; then + error_exit "bsd-user not supported on this host OS" + fi +fi if [ "$softmmu" = "yes" ]; then mak_wilds="${mak_wilds} $source_path/configs/targets/*-softmmu.mak" fi From patchwork Tue Dec 21 11:05:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1571586 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=JgAoRSkm; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJDH5544Rz9s0r for ; Tue, 21 Dec 2021 22:09:05 +1100 (AEDT) Received: from localhost ([::1]:33052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzd0x-0002sI-Gl for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 06:09:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzcxb-0005K8-RF for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:36 -0500 Received: from [2a00:1450:4864:20::42e] (port=37785 helo=mail-wr1-x42e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzcxZ-0004yr-6d for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:35 -0500 Received: by mail-wr1-x42e.google.com with SMTP id t26so26133904wrb.4 for ; Tue, 21 Dec 2021 03:05:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NBRmli3hhL/7GvJj9LProoyaec9zZHPpYyiOBrHlW/I=; b=JgAoRSkmgDSR5Ppw5D/LzRihZGFhRm3Gyak3dnPZtZuYXZbuXTF3eL/ExUq9mVrtIG I3jwhTkN8H/AbJn61qV53z86kpORKE8owGG7QlF8dvveziQml9jyWoRtNvmo5hwcMhsd EQf78UYntS+7AJgMusUI22Wam4x8YO3PX3v3ItXVoBGwUOv2JclFDxEsq5yI8DujxEYn ICifnj87l4mqqlgkfkeNPmCwOA++A8hqcaly2sRhbsUu82VNX6URuhBUyGuObJ3RCtV6 zUwcbd4mZ1GOvtuQfVLwbfxcE39CS0GzjsAOGHGS4V5mf1Ltjb4VdBZHso31koAAK+fx cr8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NBRmli3hhL/7GvJj9LProoyaec9zZHPpYyiOBrHlW/I=; b=ZS8dxmZHpH0B2sA/m0cbnryC+Pp/Yb48IX4ZjtNfc3lhjizfSG3bnI3IciuEGLil1V p8CnpZZI7HsCGaJz/7EXmo2vnZMS4vpeAnoOR7fhIUSOokcXP9phJoCXOp/uqF6DVXLJ 8xTDZ/RAGWYwYBzGUMah96n8jO7X/NJhjeEui8KV6ZiAZJivYL2vYNfV3bjJO+oojc/Z aZVvZz15UIk5j73gLeNUyDFHKfiWlz5bvye5DgQWDRBOrj1zUgKufi3U21HYuNTnp/iG Ste/ou9aGbbdo1pzZRgpGvokvH72fn2vKfeIgJukHAuHM/6bc0LknPuUGBdt/kJL75Zd Ndew== X-Gm-Message-State: AOAM530SS9vY+DYXBP3OeidpJPpXOBZZY8oI37NocuzrQTSqTVnvsrUp RMaBoRVgv/wwu2mZxKpdxaqFbsUiuXE= X-Google-Smtp-Source: ABdhPJzcoZRcFqrF4ddIyE6fXh8zXwnucE9GwogF0hJbvYyjJ/qMuawIneAGYMlIuV89HMQMKMIXiA== X-Received: by 2002:a5d:6349:: with SMTP id b9mr2135878wrw.152.1640084731871; Tue, 21 Dec 2021 03:05:31 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id az11sm1949444wmb.30.2021.12.21.03.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 03:05:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/8] configure, makefile: remove traces of really old files Date: Tue, 21 Dec 2021 12:05:21 +0100 Message-Id: <20211221110526.351709-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com> References: <20211221110526.351709-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" These files have been removed for more than year in the best case, or for more than ten years for some really old TCG files. Remove any traces of it. Signed-off-by: Paolo Bonzini Acked-by: Richard Henderson --- Makefile | 11 ++++------- configure | 9 --------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 74c5b46d38..06ad8a61e1 100644 --- a/Makefile +++ b/Makefile @@ -205,14 +205,11 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) clean: recurse-clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || : -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || : -# avoid old build problems by removing potentially incorrect old files - rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ -exec rm {} + - rm -f TAGS cscope.* *.pod *~ */*~ - rm -f fsdev/*.pod scsi/*.pod + rm -f TAGS cscope.* *~ */*~ VERSION = $(shell cat $(SRC_PATH)/VERSION) @@ -223,10 +220,10 @@ qemu-%.tar.bz2: distclean: clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : - rm -f config-host.mak config-host.h* config-poison.h + rm -f config-host.mak config-poison.h rm -f tests/tcg/config-*.mak - rm -f config-all-disas.mak config.status - rm -f roms/seabios/config.mak roms/vgabios/config.mak + rm -f config.status + rm -f roms/seabios/config.mak rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -f *-config-target.h *-config-devices.mak *-config-devices.h rm -rf meson-private meson-logs meson-info compile_commands.json diff --git a/configure b/configure index 6dafbcd362..e09e5bb58f 100755 --- a/configure +++ b/configure @@ -3696,9 +3696,6 @@ fi # so the build tree will be missing the link back to the new file, and # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. -# UNLINK is used to remove symlinks from older development versions -# that might get into the way when doing "git update" without doing -# a "make distclean" in between. LINKS="Makefile" LINKS="$LINKS tests/tcg/Makefile.target" LINKS="$LINKS pc-bios/optionrom/Makefile" @@ -3710,7 +3707,6 @@ LINKS="$LINKS tests/avocado tests/data" LINKS="$LINKS tests/qemu-iotests/check" LINKS="$LINKS python" LINKS="$LINKS contrib/plugins/Makefile " -UNLINK="pc-bios/keymaps" for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.elf \ @@ -3732,11 +3728,6 @@ for f in $LINKS ; do symlink "$source_path/$f" "$f" fi done -for f in $UNLINK ; do - if [ -L "$f" ]; then - rm -f "$f" - fi -done (for i in $cross_cc_vars; do export $i From patchwork Tue Dec 21 11:05:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1571583 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=aW3bgTZY; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJDCp5VZpz9t55 for ; Tue, 21 Dec 2021 22:06:14 +1100 (AEDT) Received: from localhost ([::1]:52750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzcyC-0005S3-I4 for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 06:06:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzcxc-0005KE-OE for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:36 -0500 Received: from [2a00:1450:4864:20::334] (port=38866 helo=mail-wm1-x334.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzcxZ-0004z2-W1 for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:36 -0500 Received: by mail-wm1-x334.google.com with SMTP id 203-20020a1c01d4000000b00345bf98da86so148476wmb.3 for ; Tue, 21 Dec 2021 03:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zZnWpUrFsd4X6ucpppSrhV5R5jyds34wDHKY5lrugqk=; b=aW3bgTZYvnj+yP+8oLv5O+e7dG/A0CTVXHbO3c1Wxx9ewQLVqn1ij4z+h9ljTZpPrB 5dfAWmyna4qg8W/+hz8t1EXm48lNJdp5Tm1jwL4B4ZK7aBzKq0tGZog1MUlhx8dFDp6G DT35Q1HQylHWV6Wfq/raqJgWmAQbHZuxcCaxq04CzLwE5sdQoFLnIM1g70o6+Ftwoiy8 24eSPVNa6n8cEnUiWhRT2qfFyqlUQbusNDTEVVpyMMLxHlDBhw4Zbxa3OqvoMcVHKag0 o9dbQnaAKp2CYPJ8EwHyu8dhSlIWn7zs66r8rUJ02fr0qjtLDkTwYwhfcDr13ZF8Zw38 A0Dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zZnWpUrFsd4X6ucpppSrhV5R5jyds34wDHKY5lrugqk=; b=AcPNdRj5/nQIFuaxTNMNeaxO45J5aT8ceji+COszzX/cL7xd1TpsaKNJS324HDW9UQ 6sPZ6j1FmGxXkRNLqz4KQAkyRL9O5Akfw1xclca1whDR5Nf+JM+Kk0X/zv+b9UvWxS9+ jwDuvj9oNlnFYyU/7KWNHSsV+U8VWrorXF3aCuniV+0L+1GovBZLY0UcYUKEMOajOWB/ Y2efYjxCSc/6Xm+EHC0fDNCwkm8J+3uyo75pbNz5ywr/m3Muk6Mh5WQQoDBwwjfOL9jD 2MfkvXHPwYOyMEecx2/cJtMZL5mCA8MxcPGa3ZS44VvsRHzvQqYQ157AlFc34F8Vni4r k51w== X-Gm-Message-State: AOAM531Ywl7gGJmzl6Fgl7ZQQltA0Hau4sK3wpQC4TWGTcudmfGZ+9bs YkaQWX6PBLqEMbBQAIXHevSk3FN5cn0= X-Google-Smtp-Source: ABdhPJxn6nHevGV1lSSk4q2up8Xh7aN/YImI4GWYFT8CdDYT1vSkpZaaZOfl7tcitJsya/3o0MxkAQ== X-Received: by 2002:a1c:a98f:: with SMTP id s137mr2190013wme.5.1640084732470; Tue, 21 Dec 2021 03:05:32 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id az11sm1949444wmb.30.2021.12.21.03.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 03:05:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/8] configure: parse --enable/--disable-strip automatically, flip default Date: Tue, 21 Dec 2021 12:05:22 +0100 Message-Id: <20211221110526.351709-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com> References: <20211221110526.351709-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::334 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Always include the STRIP variable in config-host.mak (it's only used by the s390-ccw firmware build, and it adds a default if configure omitted it), and use meson-buildoptions.sh to turn --enable/--disable-strip into -Dstrip. The default is now not to strip the binaries like for almost every other package that has a configure script. Signed-off-by: Paolo Bonzini --- configure | 10 +--------- pc-bios/s390-ccw/Makefile | 2 -- scripts/meson-buildoptions.py | 21 ++++++++++++++------- scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure b/configure index e09e5bb58f..40dd6e8d1b 100755 --- a/configure +++ b/configure @@ -308,7 +308,6 @@ debug="no" sanitizers="no" tsan="no" fortify_source="$default_feature" -strip_opt="yes" mingw32="no" gcov="no" EXESUF="" @@ -891,7 +890,6 @@ for opt do debug_tcg="yes" debug_mutex="yes" debug="yes" - strip_opt="no" fortify_source="no" ;; --enable-sanitizers) sanitizers="yes" @@ -902,8 +900,6 @@ for opt do ;; --disable-tsan) tsan="no" ;; - --disable-strip) strip_opt="no" - ;; --disable-slirp) slirp="disabled" ;; --enable-slirp) slirp="enabled" @@ -1370,7 +1366,6 @@ Advanced options (experts only): --enable-debug enable common debug build options --enable-sanitizers enable default sanitizers --enable-tsan enable thread sanitizer - --disable-strip disable stripping binaries --disable-werror disable compilation abort on warning --disable-stack-protector disable compiler-provided stack protection --audio-drv-list=LIST set audio drivers to try if -audiodev is not used @@ -3340,9 +3335,6 @@ echo "GIT_SUBMODULES_ACTION=$git_submodules_action" >> $config_host_mak if test "$debug_tcg" = "yes" ; then echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak fi -if test "$strip_opt" = "yes" ; then - echo "STRIP=${strip}" >> $config_host_mak -fi if test "$mingw32" = "yes" ; then echo "CONFIG_WIN32=y" >> $config_host_mak if test "$guest_agent_with_vss" = "yes" ; then @@ -3622,6 +3614,7 @@ echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak echo "GLIB_LIBS=$glib_libs" >> $config_host_mak echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak +echo "STRIP=$strip" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak echo "LIBS_QGA=$libs_qga" >> $config_host_mak @@ -3836,7 +3829,6 @@ if test "$skip_meson" = no; then -Doptimization=$(if test "$debug" = yes; then echo 0; else echo 2; fi) \ -Ddebug=$(if test "$debug_info" = yes; then echo true; else echo false; fi) \ -Dwerror=$(if test "$werror" = yes; then echo true; else echo false; fi) \ - -Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \ -Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \ -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \ -Db_lto=$lto -Dcfi=$cfi -Dtcg=$tcg -Dxen=$xen \ diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index cee9d2c63b..0eb68efc7b 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -44,8 +44,6 @@ build-all: s390-ccw.img s390-netboot.img s390-ccw.elf: $(OBJECTS) $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_DIR)$@") -STRIP ?= strip - s390-ccw.img: s390-ccw.elf $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET_DIR)$@") diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 96969d89ee..98ae944148 100755 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -36,6 +36,10 @@ "trace_file", } +BUILTIN_OPTIONS = { + "strip", +} + LINE_WIDTH = 76 @@ -90,14 +94,17 @@ def allow_arg(opt): return not (set(opt["choices"]) <= {"auto", "disabled", "enabled"}) +def filter_options(json): + if ":" in json["name"]: + return False + if json["section"] == "user": + return json["name"] not in SKIP_OPTIONS + else: + return json["name"] in BUILTIN_OPTIONS + + def load_options(json): - json = [ - x - for x in json - if x["section"] == "user" - and ":" not in x["name"] - and x["name"] not in SKIP_OPTIONS - ] + json = [x for x in json if filter_options(x)] return sorted(json, key=lambda x: x["name"]) diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index ae8f18edc2..46360e541d 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -13,6 +13,7 @@ meson_options_help() { printf "%s\n" ' jemalloc/system/tcmalloc)' printf "%s\n" ' --enable-slirp[=CHOICE] Whether and how to find the slirp library' printf "%s\n" ' (choices: auto/disabled/enabled/internal/system)' + printf "%s\n" ' --enable-strip Strip targets on install' printf "%s\n" ' --enable-tcg-interpreter TCG with bytecode interpreter (slow)' printf "%s\n" ' --enable-trace-backends=CHOICE' printf "%s\n" ' Set available tracing backends [log] (choices:' @@ -234,6 +235,8 @@ _meson_option_parse() { --disable-spice) printf "%s" -Dspice=disabled ;; --enable-spice-protocol) printf "%s" -Dspice_protocol=enabled ;; --disable-spice-protocol) printf "%s" -Dspice_protocol=disabled ;; + --enable-strip) printf "%s" -Dstrip=true ;; + --disable-strip) printf "%s" -Dstrip=false ;; --enable-tcg) printf "%s" -Dtcg=enabled ;; --disable-tcg) printf "%s" -Dtcg=disabled ;; --enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=true ;; From patchwork Tue Dec 21 11:05:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1571587 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=gsJ+2q0v; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJDKc3WL0z9sCD for ; Tue, 21 Dec 2021 22:11:14 +1100 (AEDT) Received: from localhost ([::1]:40044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzd31-0007ek-LC for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 06:11:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzcxd-0005KG-0D for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:37 -0500 Received: from [2a00:1450:4864:20::335] (port=38867 helo=mail-wm1-x335.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzcxa-0004zZ-8r for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:36 -0500 Received: by mail-wm1-x335.google.com with SMTP id 203-20020a1c01d4000000b00345bf98da86so148496wmb.3 for ; Tue, 21 Dec 2021 03:05:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J49N23xHBKV/77Hu3VntKAVvl0oVhU6OpoF8x6m8Wws=; b=gsJ+2q0v9R8Lg0hi7ytHs66GntZB0pMWJ5O91NCnQh4cSuREu+b3n9uL5hzBHlrSsi t7VinjKHchgzujDdlcsZ46MyvSmaPgHyCBvpwMCQV1EfoAa44oPPCERDeuJqF7lA6p86 XRhpRBOZYnFd47Pr9azOD5WMqOp09i82nr5FE62n9XRS2zOemW2Q6TvFvkK+MUR3l2KI 71frfeWdfH0qc7Iu26P//TzImWIMltBFfH9RbE8FBcvHiVJW/TevYYhOd4dmga3EXyqX rVoKbtItrXoafI+Hxwwu5QnDHLN40S3Tsp+zYPXcUweO9419BgL8CdfwZtnaI0Hu8CDN ghLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=J49N23xHBKV/77Hu3VntKAVvl0oVhU6OpoF8x6m8Wws=; b=V5NEIlAC04wV0FU6vi+O7CqUYL930gVNXErQ+hwff1xXlwWBkvyHY4pJpKBWj1UtQW tN45plDf+CAXkf6sw00kd9ma+nZpcARYvUxM3qs25ki4wwB7U77L4sq1U4hCoWoRikYU ZNFVXg+zp+8vi5TBhnWhyD0ObE6sQN4x04HEgVPlzEPaxkqYyyHuTT/9is6mucA3Dy1c qSKxK2BLrktLKIwdnBpJE2QMiTLTE8mP3MdxuSa/CgTrr1InuaT7zxxayqAOrnvS5f1I jLozKkuiXhZzWFavcXTJHE+WAvYharWMIdUMQyzhadkuzsYGb1xbwAZnfg8E8UHp0OgM lUxg== X-Gm-Message-State: AOAM533KVmnF8bR1MP8JvAM3XZ3CptkSmjPUnKfNf7DLu2yGOfoGsC9Q W22ODceA9nMriYQ5S79tPXEfXXoGqic= X-Google-Smtp-Source: ABdhPJxIRUGBoU0hKM07AGfewv9umG6dKIdTbYm0YLCzsvO7C7buEupcmznB+GDgBCnO+Uixmx+O5w== X-Received: by 2002:a05:600c:3ac8:: with SMTP id d8mr2224111wms.72.1640084733046; Tue, 21 Dec 2021 03:05:33 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id az11sm1949444wmb.30.2021.12.21.03.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 03:05:32 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 5/8] configure: move non-command-line variables away from command-line parsing section Date: Tue, 21 Dec 2021 12:05:23 +0100 Message-Id: <20211221110526.351709-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com> References: <20211221110526.351709-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::335 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x335.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This makes it easier to identify candidates for moving to Meson. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- configure | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 40dd6e8d1b..810bc36490 100755 --- a/configure +++ b/configure @@ -308,16 +308,12 @@ debug="no" sanitizers="no" tsan="no" fortify_source="$default_feature" -mingw32="no" gcov="no" EXESUF="" modules="no" module_upgrades="no" prefix="/usr/local" qemu_suffix="qemu" -bsd="no" -linux="no" -solaris="no" profiler="no" softmmu="yes" linux_user="" @@ -331,8 +327,6 @@ opengl="$default_feature" cpuid_h="no" avx2_opt="$default_feature" guest_agent="$default_feature" -guest_agent_with_vss="no" -guest_agent_ntddscsi="no" vss_win32_sdk="$default_feature" win_sdk="no" want_tools="$default_feature" @@ -527,6 +521,10 @@ fi # OS specific +mingw32="no" +bsd="no" +linux="no" +solaris="no" case $targetos in windows) mingw32="yes" @@ -2574,6 +2572,7 @@ fi ########################################## # check if we have VSS SDK headers for win +guest_agent_with_vss="no" if test "$mingw32" = "yes" && test "$guest_agent" != "no" && \ test "$vss_win32_sdk" != "no" ; then case "$vss_win32_sdk" in @@ -2604,7 +2603,6 @@ EOF echo "ERROR: The headers are extracted in the directory \`inc'." feature_not_found "VSS support" fi - guest_agent_with_vss="no" fi fi @@ -2631,6 +2629,7 @@ fi ########################################## # check if mingw environment provides a recent ntddscsi.h +guest_agent_ntddscsi="no" if test "$mingw32" = "yes" && test "$guest_agent" != "no"; then cat > $TMPC << EOF #include From patchwork Tue Dec 21 11:05:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1571585 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=MaqK0t5e; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJDH503V1z9sCD for ; Tue, 21 Dec 2021 22:09:05 +1100 (AEDT) Received: from localhost ([::1]:32936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzd0w-0002nN-QG for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 06:09:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzcxd-0005Kp-4p for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:37 -0500 Received: from [2a00:1450:4864:20::32b] (port=35604 helo=mail-wm1-x32b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzcxa-0004zm-Sh for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:36 -0500 Received: by mail-wm1-x32b.google.com with SMTP id bg2-20020a05600c3c8200b0034565c2be15so1420961wmb.0 for ; Tue, 21 Dec 2021 03:05:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E5sjI4uOofFiqMg8XcI1JjXR51NsB7PISgae11hFAus=; b=MaqK0t5eqCuGjTMuUWGG6CC2Bf1AZQ4XGtm8H/vnC4n9qnP8KZcTdmHY65We7Xto24 Y306BE8Po43kxW7yKEBR9o3QAzFyjZMMPEfDjjONyngOg/AgmaadgN6DTCbgz53ODqUk h0GEvHh1NwxTRkrtDTvfY4y4nZT7EvTYWd35obEtRnPs4zuamXbtFAYeUvXT83ne1aMs UQtSXccZACCKiwEx6BQmX/eC0K9aEy7szmPd6yTKab/LnPHToPUSAETXILiDvIUGovyi 2gWFNKFaNufcOqbaTJXbEQgxu34jevUkC9+FdLLOknuSc0cHA1ilV8P7TUKNhIOm5wyP z/GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=E5sjI4uOofFiqMg8XcI1JjXR51NsB7PISgae11hFAus=; b=FCNwwEWm5nE54uldpddc4LxAcYFMnyvgN8OmeEGdngRUmqPgX7nkuemnG9MEqjtzJK tDz5Xv9x/4uEBmSpxb8+EdEWrGjXD6Xf1YLQpjAYm7jWMOtjzn3RMgesDUtgtxobxqtz EXReGr9oTot/fOnxxsg6W6k9yFsTI9I/HFWoUarbR3G10KynztSmmyBSH/ONxGhQIFq0 z25qbXAM7Hm7uVKJXQNL4Nb2jH3SGhBYcvLQ7HlyxQ+32yQZwDKPyzy/Rvl0yHWlROmY 0SJbEq3H4cyaZ0sdJr6vpVMua/9g5cOEy1Eyy890frBf0RG+XjvIH1rEgy2ByhTC3urF jyGg== X-Gm-Message-State: AOAM531YayeG4/YIOMiyPA5pl7E34NXfExOUFpLMPteO9RjCpJJYF/qI uAMt/CGq6uVa/WUDi0oTxox/E6kvO80= X-Google-Smtp-Source: ABdhPJwQNF3bW1OG/QI0+BSHHEgRgoyjDr+XIHkxqjciRFnroD4oB5mzG0qbwtizapDY69mbyYcC1g== X-Received: by 2002:a1c:9a8d:: with SMTP id c135mr2203394wme.66.1640084733625; Tue, 21 Dec 2021 03:05:33 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id az11sm1949444wmb.30.2021.12.21.03.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 03:05:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 6/8] meson: build contrib/ executables after generated headers Date: Tue, 21 Dec 2021 12:05:24 +0100 Message-Id: <20211221110526.351709-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com> References: <20211221110526.351709-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This will be needed as soon as config-poison.h moves from configure to a meson custom_target (which is built at "ninja" time). Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- contrib/elf2dmp/meson.build | 2 +- contrib/ivshmem-client/meson.build | 2 +- contrib/ivshmem-server/meson.build | 2 +- contrib/rdmacm-mux/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build index 4d86cb390a..6707d43c4f 100644 --- a/contrib/elf2dmp/meson.build +++ b/contrib/elf2dmp/meson.build @@ -1,5 +1,5 @@ if curl.found() - executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.c', 'qemu_elf.c'), + executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.c', 'qemu_elf.c'), genh, dependencies: [glib, curl], install: true) endif diff --git a/contrib/ivshmem-client/meson.build b/contrib/ivshmem-client/meson.build index 1b171efb4f..ce8dcca84d 100644 --- a/contrib/ivshmem-client/meson.build +++ b/contrib/ivshmem-client/meson.build @@ -1,4 +1,4 @@ -executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), +executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), genh, dependencies: glib, build_by_default: targetos == 'linux', install: false) diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/meson.build index 3a53942201..c6c3c82e89 100644 --- a/contrib/ivshmem-server/meson.build +++ b/contrib/ivshmem-server/meson.build @@ -1,4 +1,4 @@ -executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), +executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), genh, dependencies: [qemuutil, rt], build_by_default: targetos == 'linux', install: false) diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build index 6cc5016747..7674f54cc5 100644 --- a/contrib/rdmacm-mux/meson.build +++ b/contrib/rdmacm-mux/meson.build @@ -2,7 +2,7 @@ if 'CONFIG_PVRDMA' in config_host # if not found, CONFIG_PVRDMA should not be set # FIXME: broken on big endian architectures libumad = cc.find_library('ibumad', required: true) - executable('rdmacm-mux', files('main.c'), + executable('rdmacm-mux', files('main.c'), genh, dependencies: [glib, libumad], build_by_default: false, install: false) From patchwork Tue Dec 21 11:05:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1571584 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=WaTJRJFr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJDH40vlbz9s0r for ; Tue, 21 Dec 2021 22:09:04 +1100 (AEDT) Received: from localhost ([::1]:32868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzd0v-0002kP-U2 for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 06:09:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzcxd-0005L1-89 for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:37 -0500 Received: from [2a00:1450:4864:20::336] (port=42709 helo=mail-wm1-x336.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzcxb-000502-IW for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:36 -0500 Received: by mail-wm1-x336.google.com with SMTP id a83-20020a1c9856000000b00344731e044bso1826096wme.1 for ; Tue, 21 Dec 2021 03:05:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ib90tZqm+itNZ7bMTWH//a4+m5K46RgXb+YLh8TmpQA=; b=WaTJRJFr9QMspMXUq3EZ4LIdOem7DhevoOwRv86notjAddmjN6ufz+vX7gGhkHslkI FtVcR4auaf8ArP2yrYjJxhrapZ951DHGXWHaw9brIXa3y08W3nZKCUWPFTWbRb27RJlH 3iYMAUa9SJPC3yRTpfWYtrYhUl8zArQcXBmkEpxJSf0ti8f9ay5hykTmW0U3bO4LkozC cpMh18V1cF/BNGaRVMHHI7wmu3TRlCeG3YWQhAx4pkL+MoT3vduPkMPItutSfP84EmbC YRf3M8JHgrrJhog45wNNM/qEgFUwN9V6FotUqMw+J67IRWZH920vM/6FkDRR1cQc1Tf/ WTOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ib90tZqm+itNZ7bMTWH//a4+m5K46RgXb+YLh8TmpQA=; b=JSiIiod02najc1YjKUhbp9G3Sv9pBkWCsSddUklUgmhqHwYrLxYx0Wo3eX6+SlPLlS 13FSXxqxdQDYPg9gfHx+/axpPXLJPQtroNQ8JP5OLW9HvbnB/LVOEE1LdgqGdj5Vj1ur S8LTa2+Y/l6X86WLMaTCY6vmGtDIzbc1nTtWq0C3ceaGpGyPKrE/YYgWsYAX0A0GnJWS MM4BAt8eG6xDMVbtgkwHRK6D3BV8aQq6mM+4sHtmOCZ4O96QtKik2MyIfI/L5p8aDwxG JqkFKRwNH9Y9jv//Xrm4bSBj/+QjwcnoLVzAtqQx0VNQxs4nN2adRpGDQ4MgJsAjBetw geFQ== X-Gm-Message-State: AOAM5339OJxN/o4r+tXJbYIdRSOSQkd69/n2l/qJBxgokKxBnafwCgWn Xhg0pB3qc74MNE5ANPqUz68oho7barM= X-Google-Smtp-Source: ABdhPJyqk9lTHHsKhdf5L6ivnhkK+Qi7ID5rH15ZZn1E/LZ0snMuCYmO8yHieaoCJRrb4WZ1O7QGhQ== X-Received: by 2002:a05:600c:3783:: with SMTP id o3mr2228466wmr.78.1640084734264; Tue, 21 Dec 2021 03:05:34 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id az11sm1949444wmb.30.2021.12.21.03.05.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 03:05:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 7/8] configure, meson: move config-poison.h to meson Date: Tue, 21 Dec 2021 12:05:25 +0100 Message-Id: <20211221110526.351709-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com> References: <20211221110526.351709-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::336 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This ensures that the file is regenerated properly whenever config-target.h or config-devices.h files change. Signed-off-by: Paolo Bonzini --- Makefile | 2 +- configure | 11 ----------- meson.build | 12 ++++++++++++ scripts/make-config-poison.sh | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 12 deletions(-) create mode 100755 scripts/make-config-poison.sh diff --git a/Makefile b/Makefile index 06ad8a61e1..2f80f56a4a 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,7 @@ qemu-%.tar.bz2: distclean: clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : - rm -f config-host.mak config-poison.h + rm -f config-host.mak rm -f tests/tcg/config-*.mak rm -f config.status rm -f roms/seabios/config.mak diff --git a/configure b/configure index 810bc36490..aff371ca81 100755 --- a/configure +++ b/configure @@ -3858,17 +3858,6 @@ if test -n "${deprecated_features}"; then echo " features: ${deprecated_features}" fi -# Create list of config switches that should be poisoned in common code... -# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special. -target_configs_h=$(ls *-config-devices.h *-config-target.h 2>/dev/null) -if test -n "$target_configs_h" ; then - sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \ - -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \ - $target_configs_h | sort -u > config-poison.h -else - :> config-poison.h -fi - # Save the configure command line for later reuse. cat <config.status #!/bin/sh diff --git a/meson.build b/meson.build index 2495360fd0..09ee427ca4 100644 --- a/meson.build +++ b/meson.build @@ -2006,6 +2006,18 @@ config_all += { 'CONFIG_ALL': true, } +target_configs_h = [] +foreach target: target_dirs + target_configs_h += config_target_h[target] + target_configs_h += config_devices_h.get(target, []) +endforeach +genh += custom_target('config-poison.h', + input: [target_configs_h], + output: 'config-poison.h', + capture: true, + command: [find_program('scripts/make-config-poison.sh')] + + (target_configs_h.length() > 0 ? ['@INPUT@'] : [])) + ############## # Submodules # ############## diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh new file mode 100755 index 0000000000..d222a04304 --- /dev/null +++ b/scripts/make-config-poison.sh @@ -0,0 +1,16 @@ +#! /bin/sh + +if test $# = 0; then + exit 0 +fi + +# Create list of config switches that should be poisoned in common code... +# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special. +exec sed -n \ + -e' /CONFIG_TCG/d' \ + -e '/CONFIG_USER_ONLY/d' \ + -e '/^#define / {' \ + -e 's///' \ + -e 's/ .*//' \ + -e 's/^/#pragma GCC poison /p' \ + -e '}' "$@" From patchwork Tue Dec 21 11:05:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1571588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=kym6TcHr; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JJDKc2jgTz9s0r for ; Tue, 21 Dec 2021 22:11:14 +1100 (AEDT) Received: from localhost ([::1]:40216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzd32-0007lw-NC for incoming@patchwork.ozlabs.org; Tue, 21 Dec 2021 06:11:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzcxe-0005Mp-AE for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:38 -0500 Received: from [2a00:1450:4864:20::42e] (port=33338 helo=mail-wr1-x42e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzcxc-000512-Oy for qemu-devel@nongnu.org; Tue, 21 Dec 2021 06:05:38 -0500 Received: by mail-wr1-x42e.google.com with SMTP id d9so6625331wrb.0 for ; Tue, 21 Dec 2021 03:05:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TpUJWRG7fXUtP+zjxXrVkC9l5NszEY9xXzN0gYS9P2c=; b=kym6TcHrc1s0H1oVinoDy4tET02pqKuBILVL4iJN5C7RpAqKEhy9vyax6WU0Hari4H BN9dty6gI1yK05hj/ogJGDF1SxPykzPmxTRnAG0vm7bntr5UibpUlfUkqt+yVUNV48qf KHlIy8UOlrQTKfQdzJdvMXTkUkIga7Yixq/xTOFG5Ok1Rw3dGsaiHeqfOcKY51CS9xBy +xKQpeNDUOyvj6SDIeQ+v83mBJYpTLJZaGU6KmTaF7SsJ1jKNUI7wfPN/BrBMWSFerzb w/X2uj/IOz2JDG0ovf2+ouNjuPZOm+5107f7Bm96qKcPVcaEsdCv4LqbDVg57YTbZhHH OHPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TpUJWRG7fXUtP+zjxXrVkC9l5NszEY9xXzN0gYS9P2c=; b=IibJMwAOOdN7wrwAcWPw62nLx9SLWZiCHI+Y09zYBe1VB9vt0h6DPetc1grqjLXiG3 Gt1DpwUS0/oBJolxP0LD5fqUNsDraBD0UPEs4TiIbEX3Hm7Unv64O07iMN3ccWIcNlKt WCH5wt3cG0bUfGQrShC8tSNaJObGAr/LU544XmOTdoAzHZrQ3akoKQQmQcj2H+6KW0s/ dnpbuzpEenVkx6NORqFlinXM3ZlVGUsYKoCURqqKuO10PBSVv9cZromb9izSfZM0nuHh zJPo/SAQcRCNp5LxGh0fSaPhvkHlTbS8NSMtnoA2ZBVxtJL2ll9rWFi8YUk3gXb2tq4R oMoQ== X-Gm-Message-State: AOAM533pd/0B8xWqXOmQayt7g+6BtyYMNImr+gq//WpKKeJNBXEM4Iy6 hj+sbrbI3I2QYO4SC/e+m0hKaJDc3f0= X-Google-Smtp-Source: ABdhPJy9YiVCLcHpKG8TjKWK780CniYrxwuLkf8ely8HsUgJAS3AXE2kPQrb4DVZ1+PYPTtJhEyP8g== X-Received: by 2002:a05:6000:168f:: with SMTP id y15mr2215926wrd.61.1640084735644; Tue, 21 Dec 2021 03:05:35 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id az11sm1949444wmb.30.2021.12.21.03.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Dec 2021 03:05:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 8/8] meson: add comments in the target-specific flags section Date: Tue, 21 Dec 2021 12:05:26 +0100 Message-Id: <20211221110526.351709-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211221110526.351709-1-pbonzini@redhat.com> References: <20211221110526.351709-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42e (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: richard.henderson@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meson.build b/meson.build index 09ee427ca4..0a6d57125f 100644 --- a/meson.build +++ b/meson.build @@ -233,6 +233,7 @@ endif # Target-specific checks and dependencies # ########################################### +# Fuzzing if get_option('fuzzing') and get_option('fuzzing_engine') == '' and \ not cc.links(''' #include @@ -244,6 +245,7 @@ if get_option('fuzzing') and get_option('fuzzing_engine') == '' and \ error('Your compiler does not support -fsanitize=fuzzer') endif +# Tracing backends if 'ftrace' in get_option('trace_backends') and targetos != 'linux' error('ftrace is supported only on Linux') endif @@ -257,6 +259,7 @@ if 'syslog' in get_option('trace_backends') and not cc.compiles(''' error('syslog is not supported on this system') endif +# Miscellaneous Linux-only features if targetos != 'linux' and get_option('mpath').enabled() error('Multipath is supported only on Linux') endif @@ -266,6 +269,7 @@ if targetos != 'linux' and get_option('multiprocess').enabled() endif multiprocess_allowed = targetos == 'linux' and not get_option('multiprocess').disabled() +# Target-specific libraries and flags libm = cc.find_library('m', required: false) threads = dependency('threads') util = cc.find_library('util', required: false) @@ -306,6 +310,7 @@ elif targetos == 'openbsd' endif endif +# Target-specific configuration of accelerators accelerators = [] if not get_option('kvm').disabled() and targetos == 'linux' accelerators += 'CONFIG_KVM'