From patchwork Fri Mar 7 15:15:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 871207 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp813525wri; Fri, 7 Mar 2025 07:17:20 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVGI2Z02w+TF0ChskzAz7Oxa5teXKxOEE8fXR//8QmkBGWj5Y2LeQpm7pf/ISR/DB0PraXfhA==@linaro.org X-Google-Smtp-Source: AGHT+IHCj32uUP10EkcXyzaIUJ0Ne/QXbNG6Amu2Fzt5OLXfqLi0NocX3R/KxQJF9Hzq12FozCUB X-Received: by 2002:a05:620a:6089:b0:7c3:d22e:1b42 with SMTP id af79cd13be357-7c4e16780a6mr626028185a.7.1741360640739; Fri, 07 Mar 2025 07:17:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741360640; cv=none; d=google.com; s=arc-20240605; b=f1Gtl+5YZ2KIaEOq71JRgjLVrbyuqnh8ZLUfwYLPAWjl/6ChjVxXFeX2i1dUbWRbLs 4SvwXlRZVPRYtJGs4etNUA31OVAhrPHvTo9SSp0wVnzFrsAon/havXNNAlEWSHiAzpea zMvlNua2Dn34G0987MS+FJEy0/wI31TFTdpww0qg8mttGHlgpdijkawCH/600qO0Dn2k ycVyOtd85gAoCzhPGrkTHZv4wjrl/HwBFMVX2n6SIywZ2YTKfx6p/42zNbLIxzcXs7nR APxBtzon5yyZLTgIJrtT4591jB0ZPAGilc4Ju+h/eb0o/sgjpUYFqSFM+orzEWRvTkiS a1dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=vFDIjZoBEkcGFS81AHnWr7iG9XFN0GhdGmikXg5Pgg8=; fh=FXtWUx7amUH5pCqcNLOkhTwo5r7IFsByJZRWfWxnad8=; b=j63abmQvLFwZpQdjmcycNrnxBgWlCuEGWXhNusYc6se7s7MUBW/1LDMy23JdeRZP4Z qzCLyPkfTNNb9cdv0pUhHaYCoVjCXsTkrD4BHVoLrInr+txcmV9BOMCSTpoQ6aqlS1cx J4n3e9t0cWNvilKXyqzL0ToEMsCM3lMbTxTsBMe+8TvKjXrGmWh6Y5H//3P1Qc9vloOL KspjofvZ3HMjmcGt1HUgY3oSCowvxbzI0YpMNjoxGQS8xA5Uq+PX2+aXegNBWj8NdmIC jO2EXSrrId4qJJSgf1yQBRw7jPGLKfB94xuQdKQ8pYrjA/Ai137guFltQzzbobsU219U I65g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="W31y/ffg"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3e55116bbsi347369885a.360.2025.03.07.07.17.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 07:17:20 -0800 (PST) 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="W31y/ffg"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tqZRh-0005vu-CF; Fri, 07 Mar 2025 10:17:06 -0500 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 1tqZQb-0005pK-7Y for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:15:59 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqZQX-0003Rp-8y for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:15:56 -0500 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-39127512371so1208972f8f.0 for ; Fri, 07 Mar 2025 07:15:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741360551; x=1741965351; darn=nongnu.org; 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=vFDIjZoBEkcGFS81AHnWr7iG9XFN0GhdGmikXg5Pgg8=; b=W31y/ffgH9BKGNQLgS/Zd7nIXmJBE0i0CcOxexiit0Mpz6+vnZ7Pf9KBRsngwr+T3d hkfEwbxBCTAO/z1yqIaUCZo71TC5Gs6K0QJBjKDwvgjAI7rRnU0xgK/iYktxiBk2U9uD Hj/izquxOussrY1EEHhqwj9iR9TESZtfbG74hru2w3Iryx7IAy9lVuP6JxqiJvZhoRP1 zWHKe4ZPXQCnY1RWhbTczsZ5MfHS4Eub3FPIX5HyqrOzSHKNvxXJzwlqS/PlOe1r5iZB ila9huRI0y9WjU/sofc9aYlpnou+zDjqPAPvbbIW24+zZL2TJfigJUJ5FOdJreHMLUwD 7eEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741360551; x=1741965351; 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=vFDIjZoBEkcGFS81AHnWr7iG9XFN0GhdGmikXg5Pgg8=; b=EaCTHy+bHJ3DD9/0wSql3MIO6DpuC7hv9kVl7oIsoWxCNIw1FPGnk2QG/LLHiu5yMF tyQcfG1qtSynPpm7gQrtV5ox/umgLF4WbOOFXZygfORmu3dhpgeU3XOsLuLZgB6btpq7 ElLY8kpXzhkQXT6IhQUf1s3VoW5uHsZUhf7sl8f9A91tJOmXoKWFvJlVE4vHgpsV22K6 HN8nbHS0sLXg54xqpO1nSB9fYCkQJNGDNdTWbMzKLJUDY+9qELT8h28PozBSucy5BdT1 Mb2j8xy4XH3XckFbEvRVEYaBmVhghVGARckQ76xZN6/3OtLegkreEet11RJEp8iWqcnY a2Cw== X-Gm-Message-State: AOJu0YyoRh4uQT5QB0DGc5Rk5XqvkVRt6CXcTOLzd4XWuDCJXoHfBcvO h1NY2xzCC2eRNVSXYqVDT8q3MxUo94ifk8yyUhsgf2VghtVL5A5rTbBpZNLIEgsAwAHNxzPe999 FuH4= X-Gm-Gg: ASbGncuURpxgfXwDWZqJL0G8Jf55HMcOcH0VU3Ixh8ZvfcVSk3e3H/QcILBHnocDzCW 99GaulVK1b8sM5adDZA3CkBYl44rBO/z7qrHhpds89WFExJTlbbQDxDmol4Gl7/ifz6uVWTyBDM aMzCve89DOxmWMnWe5J5gVHZ0iJymYfuvERNBxlm2CGJpvtJ1pmgmLTXOFQlkndP4xwytdatAHI m2u9uXhMUBosKFY/Enh/A49QKX77HlEDzkdFhhZxBetQHzsgirGwh+zHOg+6EWR9F7v6gpffKAr gG3LibRNcs8hkv1IkaiXErzTZrjhM3PnTn8P1A/2NtSLE4IoRafptRvOoObSakkKI9yffCE4Taj bMSnAbNPBUATKZoZZqMo= X-Received: by 2002:a5d:5f8f:0:b0:391:2e31:c7e8 with SMTP id ffacd0b85a97d-39132d66e3dmr2548546f8f.2.1741360550796; Fri, 07 Mar 2025 07:15:50 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3912c0e344esm5611173f8f.73.2025.03.07.07.15.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 07:15:50 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Ani Sinha , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Marcel Apfelbaum , Pierrick Bouvier , Paolo Bonzini , "Michael S. Tsirkin" , Richard Henderson , David Hildenbrand , Igor Mammedov , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/7] system: Replace arch_type global by qemu_arch_available() helper Date: Fri, 7 Mar 2025 16:15:37 +0100 Message-ID: <20250307151543.8156-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307151543.8156-1-philmd@linaro.org> References: <20250307151543.8156-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 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 qemu_arch_available() is a bit simpler to understand while reviewing than the undocumented arch_type variable. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé --- include/system/arch_init.h | 2 +- hw/scsi/scsi-disk.c | 2 +- system/arch_init.c | 5 ++++- system/qdev-monitor.c | 4 ++-- system/vl.c | 6 +++--- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/system/arch_init.h b/include/system/arch_init.h index d8b77440487..51e24c3091e 100644 --- a/include/system/arch_init.h +++ b/include/system/arch_init.h @@ -25,6 +25,6 @@ enum { QEMU_ARCH_LOONGARCH = (1 << 23), }; -extern const uint32_t arch_type; +bool qemu_arch_available(unsigned qemu_arch_mask); #endif diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index e7f738b4841..7c87b20e694 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -3165,7 +3165,7 @@ static void scsi_property_add_specifics(DeviceClass *dc) ObjectClass *oc = OBJECT_CLASS(dc); /* The loadparm property is only supported on s390x */ - if (arch_type & QEMU_ARCH_S390X) { + if (qemu_arch_available(QEMU_ARCH_S390X)) { object_class_property_add_str(oc, "loadparm", scsi_property_get_loadparm, scsi_property_set_loadparm); diff --git a/system/arch_init.c b/system/arch_init.c index b1baed18a30..61c6f680c94 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -38,4 +38,7 @@ int graphic_height = 600; int graphic_depth = 32; #endif -const uint32_t arch_type = QEMU_ARCH; +bool qemu_arch_available(unsigned qemu_arch_mask) +{ + return qemu_arch_mask & QEMU_ARCH; +} diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 856c9e8c32e..5588ed2047d 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -132,7 +132,7 @@ static const char *qdev_class_get_alias(DeviceClass *dc) for (i = 0; qdev_alias_table[i].typename; i++) { if (qdev_alias_table[i].arch_mask && - !(qdev_alias_table[i].arch_mask & arch_type)) { + !qemu_arch_available(qdev_alias_table[i].arch_mask)) { continue; } @@ -218,7 +218,7 @@ static const char *find_typename_by_alias(const char *alias) for (i = 0; qdev_alias_table[i].alias; i++) { if (qdev_alias_table[i].arch_mask && - !(qdev_alias_table[i].arch_mask & arch_type)) { + !qemu_arch_available(qdev_alias_table[i].arch_mask)) { continue; } diff --git a/system/vl.c b/system/vl.c index 04f78466c41..ec93988a03a 100644 --- a/system/vl.c +++ b/system/vl.c @@ -878,11 +878,11 @@ static void help(int exitcode) g_get_prgname()); #define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ - if ((arch_mask) & arch_type) \ + if (qemu_arch_available(arch_mask)) \ fputs(opt_help, stdout); #define ARCHHEADING(text, arch_mask) \ - if ((arch_mask) & arch_type) \ + if (qemu_arch_available(arch_mask)) \ puts(stringify(text)); #define DEFHEADING(text) ARCHHEADING(text, QEMU_ARCH_ALL) @@ -2929,7 +2929,7 @@ void qemu_init(int argc, char **argv) const QEMUOption *popt; popt = lookup_opt(argc, argv, &optarg, &optind); - if (!(popt->arch_mask & arch_type)) { + if (!qemu_arch_available(popt->arch_mask)) { error_report("Option not supported for this target"); exit(1); }