From patchwork Tue Jun 20 08:26:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 694444 Delivered-To: patch@linaro.org Received: by 2002:adf:e885:0:0:0:0:0 with SMTP id d5csp186461wrm; Tue, 20 Jun 2023 01:28:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6P4J/yBC6UVxsBtdeS8Qffp+xH31NfWbb4HgIOAOSeJ7qg7rmK0kM+CgOQGFgU93WOz/fI X-Received: by 2002:a05:620a:8005:b0:762:6330:c96f with SMTP id ee5-20020a05620a800500b007626330c96fmr5888984qkb.53.1687249709860; Tue, 20 Jun 2023 01:28:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687249709; cv=none; d=google.com; s=arc-20160816; b=zpwnD83jbp/ThLe/kApBs5CBoT2nT5mWB4QWuFbHiZ1qgCrWQwalz/mUN9eXju42Vq S6FdJeT+KXL1HrFBGVkpe81t7C2Vz8/H41Bx8TaNowdQ7TniWtip0YOalFNOc5Pl5VwD WJa6IuqFstZ69cIk9oMGNJNZEXpzuAuqKb6ikmP4TxMUQpNmBVSjseIMuNTxYrODCVca WlSerg4C6NZXd5EOvIyaC2tsloDPOZsFkP8nGvf3rkWo/QczqYavhVDBa9f+YCoFh69v h/9vEaMVOxF/Kzfum277ktLeUtY8iBrGV0Net7qy06QiuS99mjKwpOapNEn7V/SAZOdX pKVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KzCBOsKHuo5miRycsmYlRewJ+KNofg/t1eKhQIKYA2M=; b=viq6qcYoNz+ClSy/JJwPUON/IThnhabiM1uY0k8B1+zSEQjDJgPp/FfOrza8OClEkh K4j9TfMehS/pJ/uq+kJ6gcrE+knmNBhCVyuGMvZ5guKDdJM1xPUc7tpmPF2xvSi06oqQ SyCJYj+gitkFgXHl7F5HAFbbV1jvJaiMON5nooIcmC4Rknz+sMIeK5kRichsRUdBFLzu 1NhopV/33w1fmAQcH1nviCbvcBeF9IFWxMT8qezySLxgmigPpWyDFyfl/MsOBY2QHQFC Zq2tDHPmALq6ziQb02qMl5kNPBef+67xoZvPfdUeb09fZSjOmONdkTRkcMlQ84zZ7R2v BTJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QD5471JS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m14-20020a05620a13ae00b0074a7e3c40f1si621821qki.349.2023.06.20.01.28.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Jun 2023 01:28:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QD5471JS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBWh6-0003pc-Nm; Tue, 20 Jun 2023 04:26:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qBWh3-0003p5-EB for qemu-devel@nongnu.org; Tue, 20 Jun 2023 04:26:29 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qBWh0-00068T-6w for qemu-devel@nongnu.org; Tue, 20 Jun 2023 04:26:29 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-5186a157b85so6157099a12.0 for ; Tue, 20 Jun 2023 01:26:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1687249584; x=1689841584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KzCBOsKHuo5miRycsmYlRewJ+KNofg/t1eKhQIKYA2M=; b=QD5471JSIQ/Q7ht1kBpHw0g0DpsMC8mUTXSr8UzyYB9PK8oNyWT+z+8urUjjbi/BYX l8rCY5LNy5d0UbnBIFc6Z2px+Wnpl193YC+EuUVgJLEGDAiJK1hp40vzqAuxeyhPufu8 w5d47TshCN2nk9nvHo9g2N1ABOClFqfHshpa3XBbuu5gqMcTSROEm97YX6tlDS/sFuQI pjtxi+TtGLHwWTCnka2MEQggn8b/KHFhJgmW5VD+ke9TNkUUK8YduvZadFpp7OSGtoLi 3VM7h9DpCYZr2HOEdQ+fnFalk4JzlHyrMzkWrIczDJF7dYHy7YevLMSLlvVofZv3hKF6 dDFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687249584; x=1689841584; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KzCBOsKHuo5miRycsmYlRewJ+KNofg/t1eKhQIKYA2M=; b=FvLx9wqizt2I5JJUFO7rI5dwhHj5HGjMuyvcYxvcqkF0/LJMT934sHY5ZZz1zGgBrW qgN9EFCc6k4I3N4XY7rKFZHXSHosQMyTUoSBwVrvD807a6s/Mgz209XgQDsUjQwAtFgP ImDSSuGw2femf4PlYsXR+0JSuu/M+lUnX1cTtPo689hbPmAAqfwjnWt5O0wbZg38Wv22 VkfZNLiXe6y3Xi4RRVfJyfs8aYB3e/l1zsv9AY6omCY35/BwwNJsohuCCcj8MReVakk5 FvyGLkRP6FJAGVzaPNjqzCtXPnBTbcrX7PQt9IMgtSV/2n7QSWaKWDsDE6Yvavxn0GT2 IFjQ== X-Gm-Message-State: AC+VfDyfaAqjb5MfLsmOX4pnCXBP+WaYG6G8YZdPblMOXBahQQrRupE6 8CqLgd1Qfyyif35ge60DiXZK+NtATk7O+Hl1yT7k3f2V X-Received: by 2002:a17:907:25cc:b0:989:450:e567 with SMTP id ae12-20020a17090725cc00b009890450e567mr1674525ejc.65.1687249584466; Tue, 20 Jun 2023 01:26:24 -0700 (PDT) Received: from stoup.lan ([176.176.183.29]) by smtp.gmail.com with ESMTPSA id z19-20020a170906669300b00977c7566ccbsm935901ejo.164.2023.06.20.01.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 01:26:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 11/16] meson: Replace CONFIG_SOFTMMU -> CONFIG_SYSTEM_ONLY Date: Tue, 20 Jun 2023 10:26:06 +0200 Message-Id: <20230620082611.770620-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230620082611.770620-1-richard.henderson@linaro.org> References: <20230620082611.770620-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=richard.henderson@linaro.org; helo=mail-ed1-x529.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Since we *might* have user emulation with softmmu, use the clearer 'CONFIG_SYSTEM_ONLY' key to check for system emulation. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230613133347.82210-9-philmd@linaro.org> Signed-off-by: Richard Henderson --- meson.build | 4 ++-- accel/qtest/meson.build | 2 +- accel/stubs/meson.build | 2 +- accel/tcg/meson.build | 6 +++--- dump/meson.build | 2 +- hw/i386/kvm/meson.build | 2 +- migration/meson.build | 2 +- monitor/meson.build | 2 +- qapi/meson.build | 2 +- semihosting/meson.build | 2 +- softmmu/meson.build | 4 ++-- target/i386/tcg/sysemu/meson.build | 2 +- ui/meson.build | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meson.build b/meson.build index 3276f738ae..0faca1dc0d 100644 --- a/meson.build +++ b/meson.build @@ -2991,7 +2991,7 @@ config_all += config_host config_all += config_all_disas config_all += { 'CONFIG_XEN': xen.found(), - 'CONFIG_SOFTMMU': have_system, + 'CONFIG_SYSTEM_ONLY': have_system, 'CONFIG_USER_ONLY': have_user, 'CONFIG_ALL': true, } @@ -3665,7 +3665,7 @@ endif softmmu_ss.add(authz, blockdev, chardev, crypto, io, qmp) common_ss.add(qom, qemuutil) -common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: [softmmu_ss]) +common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [softmmu_ss]) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) common_all = common_ss.apply(config_all, strict: false) diff --git a/accel/qtest/meson.build b/accel/qtest/meson.build index 176d990ae1..2018de8a05 100644 --- a/accel/qtest/meson.build +++ b/accel/qtest/meson.build @@ -1 +1 @@ -qtest_module_ss.add(when: ['CONFIG_SOFTMMU'], if_true: files('qtest.c')) +qtest_module_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: files('qtest.c')) diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 0249b9258f..f7a9486e06 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -4,4 +4,4 @@ sysemu_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) sysemu_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) -specific_ss.add_all(when: ['CONFIG_SOFTMMU'], if_true: sysemu_stubs_ss) +specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: sysemu_stubs_ss) diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index aeb20a6ef0..166bef173b 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -10,18 +10,18 @@ tcg_ss.add(files( 'translator.c', )) tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) -tcg_ss.add(when: 'CONFIG_SOFTMMU', if_false: files('user-exec-stub.c')) +tcg_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c')) tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c')]) tcg_ss.add(when: libdw, if_true: files('debuginfo.c')) tcg_ss.add(when: 'CONFIG_LINUX', if_true: files('perf.c')) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files( +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( 'cputlb.c', 'monitor.c', )) -tcg_module_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: files( +tcg_module_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( 'tcg-accel-ops.c', 'tcg-accel-ops-mttcg.c', 'tcg-accel-ops-icount.c', diff --git a/dump/meson.build b/dump/meson.build index df52ee4268..3ef1f7ce00 100644 --- a/dump/meson.build +++ b/dump/meson.build @@ -1,2 +1,2 @@ softmmu_ss.add([files('dump.c', 'dump-hmp-cmds.c'), snappy, lzo]) -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files('win_dump.c')) +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('win_dump.c')) diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build index 6621ba5cd7..ab143d6474 100644 --- a/hw/i386/kvm/meson.build +++ b/hw/i386/kvm/meson.build @@ -19,4 +19,4 @@ xen_stubs_ss.add(when: 'CONFIG_XEN_EMU', if_false: files( 'xen-stubs.c', )) -specific_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: xen_stubs_ss) +specific_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: xen_stubs_ss) diff --git a/migration/meson.build b/migration/meson.build index 8ba6e420fe..9975407cd0 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -40,6 +40,6 @@ if get_option('live_block_migration').allowed() endif softmmu_ss.add(when: zstd, if_true: files('multifd-zstd.c')) -specific_ss.add(when: 'CONFIG_SOFTMMU', +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: files('ram.c', 'target.c')) diff --git a/monitor/meson.build b/monitor/meson.build index ccb4d1a8e6..4c0a33ae65 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -7,5 +7,5 @@ softmmu_ss.add(files( )) softmmu_ss.add([spice_headers, files('qmp-cmds.c')]) -specific_ss.add(when: 'CONFIG_SOFTMMU', +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'hmp-cmds-target.c', 'hmp-target.c'), spice]) diff --git a/qapi/meson.build b/qapi/meson.build index 9fd480c4d8..60a668b343 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -141,6 +141,6 @@ foreach output : qapi_specific_outputs + qapi_nonmodule_outputs if output.endswith('.trace-events') qapi_trace_events += qapi_files[i] endif - specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: qapi_files[i]) + specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: qapi_files[i]) i = i + 1 endforeach diff --git a/semihosting/meson.build b/semihosting/meson.build index 8057db5494..b07cbd980f 100644 --- a/semihosting/meson.build +++ b/semihosting/meson.build @@ -3,7 +3,7 @@ specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files( 'syscalls.c', )) -specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SOFTMMU'], if_true: files( +specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM_ONLY'], if_true: files( 'config.c', 'console.c', 'uaccess.c', diff --git a/softmmu/meson.build b/softmmu/meson.build index 974732b0f3..d75f45b7c3 100644 --- a/softmmu/meson.build +++ b/softmmu/meson.build @@ -1,4 +1,4 @@ -specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files( +specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: [files( 'arch_init.c', 'ioport.c', 'memory.c', @@ -6,7 +6,7 @@ specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files( 'watchpoint.c', )]) -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TCG'], if_true: [files( +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: [files( 'icount.c', )]) diff --git a/target/i386/tcg/sysemu/meson.build b/target/i386/tcg/sysemu/meson.build index 2e444e766a..7179bd21fb 100644 --- a/target/i386/tcg/sysemu/meson.build +++ b/target/i386/tcg/sysemu/meson.build @@ -1,4 +1,4 @@ -i386_softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_SOFTMMU'], if_true: files( +i386_softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_SYSTEM_ONLY'], if_true: files( 'tcg-cpu.c', 'smm_helper.c', 'excp_helper.c', diff --git a/ui/meson.build b/ui/meson.build index e09b616a66..125dd41cd6 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -1,6 +1,6 @@ softmmu_ss.add(pixman) -specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: pixman) # for the include path -specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl) # for the include path +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: pixman) # for the include path +specific_ss.add(when: ['CONFIG_SYSTEM_ONLY'], if_true: opengl) # for the include path softmmu_ss.add(png) softmmu_ss.add(files(