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); } From patchwork Fri Mar 7 15:15:38 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: 871208 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp813629wri; Fri, 7 Mar 2025 07:17:34 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWKoHizVgF2G/yqjrHO5to5WLSupSZN5ei3o7II99MOGqMN5/sr2HkdoDVUFXFfSJko37SFEQ==@linaro.org X-Google-Smtp-Source: AGHT+IEV4jXvbjiFqNUqimRBTS+CoqvrfrpZLPruyYwrsdKkQTqBDm28Jb257hWe/Kq67WoNZw7o X-Received: by 2002:a05:6214:76c:b0:6e8:90eb:e591 with SMTP id 6a1803df08f44-6e90065264emr40677686d6.24.1741360653273; Fri, 07 Mar 2025 07:17:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741360653; cv=none; d=google.com; s=arc-20240605; b=P96dx/KTK+BJLB7R1BOe18etKqfgljUw0ZhuwIqB7cORuFcZTpFu3hxmp5AuhYDDsy kBhj7VcYLIhtsSWvVrrOmp3nCB/eUCgUM6NWFbYtUZ1ujix3clnlIk1iK262tLPac849 NWDhwvVbfRj3PN9UMdYRVcNcNnkTWnTN032SH9PnxTyLMmWzDVbVwwhIBkSC1FOLW6ET m5pohcNz6Xcj/ePl11LrcRlq+29acrXFBvWQ371qLVmH2oB78WJKJ/cpXtb21Pcrb0mv 5UUpUMk0vd/0tfU2HvrM/cwRQ5QvpOH+UAaNfyzXVWiZkyLRIwz6tOsQfP63mYduIAX0 wEeA== 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=oJ6QS8bPHspYWexuxW/Mo3/+G0MWF76KuZRGtLsMeFA=; fh=FXtWUx7amUH5pCqcNLOkhTwo5r7IFsByJZRWfWxnad8=; b=LXv1HaqtVxpFt5nAn0pUNc9Kc7j3nGDi3deE+dv5u/8WtG6HdkXY8omubxFVNBPQfl 72TdqKF/U5ozHQSpHUV8grkT4EYh6Uf9RBlLSWr5GaqA43rEonvvBY2xYrcrcckEBZFF iBpepjkLtUhppVUC9JRB3DsHKSjcHou0GlBh9CjcIXqv3FNSpftXrIBQE7UfGo+IcGxk 2ybie23SARmu4WrZyrwYS5/dqcviR+DZl/Az/eJLhGMthj9ExhUICqOgCrN2w0KsM/WH a6U3phkmGCEJoqZU9Z7+lin0D84OdRQZZ+9ZKm5rQCrFuIRF/HUIDG54r1cYzk1skBx6 td/g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="fA/hhJRy"; 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 6a1803df08f44-6e8f707cf0bsi36478766d6.84.2025.03.07.07.17.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 07:17:33 -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="fA/hhJRy"; 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 1tqZRw-00060T-2U; Fri, 07 Mar 2025 10:17:21 -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 1tqZQe-0005pz-RE for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:06 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqZQd-0003cy-0X for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:00 -0500 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43bd87f7c2eso11395935e9.3 for ; Fri, 07 Mar 2025 07:15:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741360556; x=1741965356; 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=oJ6QS8bPHspYWexuxW/Mo3/+G0MWF76KuZRGtLsMeFA=; b=fA/hhJRylF7WJsSoWEQvloCOypH9P60jFhquyRMNytYvJY3jBMphqwPMWP8mV3l5z3 oMkMwPG+yaEWFgVFZdumjZSNP1hysX6ylV3rJdgejDwknBAOb6X1n2sXWya3JfZ8/x3o snTgttPFVav/qFvYKeuw6Q3IMIvHj5qRP9n3/gGz1R3g/qiK0kTPlBib9e/bTu1P0eN5 KpdGlrYZt6ngIztmIYHERIpqgwtr2cy/A76fHnSfCmLXXu/nZHQhV06IdMFupRz1v3Dr k6HvfzyCJQG8ZteL3FZqOdiPJlPF42EcKA3S3HPgObyjL4AFWplFZs8jp+zEor6oE75c uesg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741360556; x=1741965356; 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=oJ6QS8bPHspYWexuxW/Mo3/+G0MWF76KuZRGtLsMeFA=; b=iAI/QIcOfscneJb3CXKz0ZBCKs70LJGV7ZbjVTgil1w7h7PeRB22ByzqOKVOAJ6EOg c1EKHc1+JBz6jlN+c7WXr7oi7TJN/Itf0fUmnnhrzVe2Z3sWDWW8+nkHeqPShyvq+T5Q MpwmIUU2V7YFb9n4EGlJhLO3BLALwmv6BuJ1cF7li6d+dk+qrSgbnvzxICO6pwUOUy5p 8v4CxajcYlxzODwLWGRIvC1S9So/h1XYe7zFAoDldHb2PLUTR6odw36rcxNPvJ4DbA0G ilUCa/mgQvLUcHo35at49uB4r4vxENpQr1oBXuWjVNlOA8t9ZaEK6xEfeec4xsT4mQ12 xEPA== X-Gm-Message-State: AOJu0Yxd5ZUWp4LYUdR68ECXX1A6kfMKdJ7uKSyAF+i9uRL/jxwOLx8R ZQGQmshRzjqbEDxlPdapjgnfmMpl7Bpwpqx9cf/ByGAgzd6mNNmInw33lVXWiK/J8FLcejOb124 BCBM= X-Gm-Gg: ASbGncsVM/GS8udDZEScZk/Dm0jK6XL/y31RcCoHVmcYd2EOuyOtnCgvAbAY/liUINM +Dba8/0cNEGRcgBJOGGxNy6QYnFmIZRhVaKDRs4/rbkrDgRJM8d8H4fTje6cllp4ywHtxMF/J1Q tua8iDTVLVy5oPvNEuUvrfveLenFazM10+BDWdi2hkbzU+rwW4yRuSY+FOxZr5yFk9uSJvlAcod h5Tfan12/tbTff7yuWswAvAKL97tcgHZLKj3ifvTw+vIRdUWJa+OxbXDk697ynMNSoj5nkp2VaM Iai2ngGl8gLRfCUUeAhsc6XtxS9OhLtHtEh9N0eXQMJAXttqoPz16l1T6e3w5ijjBWrLRoHBL/0 QvmOum1OuQ8yDbmI5KVQ= X-Received: by 2002:a5d:5f45:0:b0:390:fb37:1bd with SMTP id ffacd0b85a97d-39132da8e47mr2305456f8f.46.1741360555832; Fri, 07 Mar 2025 07:15:55 -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-3912bfdfa52sm5474263f8f.21.2025.03.07.07.15.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 07:15:55 -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 2/7] hw/acpi: Introduce acpi_builtin() helper Date: Fri, 7 Mar 2025 16:15:38 +0100 Message-ID: <20250307151543.8156-3-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 acpi_builtin() can be used to check at runtime whether the ACPI subsystem is built in a qemu-system binary. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Ani Sinha --- include/hw/acpi/acpi.h | 3 +++ hw/acpi/acpi-stub.c | 5 +++++ hw/acpi/core.c | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index e0e51e85b41..d1a4fa2af84 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -150,6 +150,9 @@ struct ACPIREGS { Notifier wakeup; }; +/* Return whether ACPI subsystem is built in */ +bool acpi_builtin(void); + /* PM_TMR */ void acpi_pm_tmr_update(ACPIREGS *ar, bool enable); void acpi_pm_tmr_calc_overflow_time(ACPIREGS *ar); diff --git a/hw/acpi/acpi-stub.c b/hw/acpi/acpi-stub.c index e268ce9b1a9..790bf509e5d 100644 --- a/hw/acpi/acpi-stub.c +++ b/hw/acpi/acpi-stub.c @@ -25,3 +25,8 @@ void acpi_table_add(const QemuOpts *opts, Error **errp) { g_assert_not_reached(); } + +bool acpi_builtin(void) +{ + return false; +} diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 870391ed7c8..58f8964e130 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -78,6 +78,11 @@ static void acpi_register_config(void) opts_init(acpi_register_config); +bool acpi_builtin(void) +{ + return true; +} + static int acpi_checksum(const uint8_t *data, int len) { int sum, i; From patchwork Fri Mar 7 15:15:39 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: 871209 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp813982wri; Fri, 7 Mar 2025 07:18:16 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXmXH0AdCQhc3rNYHrynwFPvk/7U2G7fw0DNblMWUdSc6e3NiKbWf7gYFhgP2EOZdwm8BMS/w==@linaro.org X-Google-Smtp-Source: AGHT+IEyBY7fZLK3v2OhXfhCxC0JxkHRa7xn12qf21Oru7ctz4I2lJMjlN4UIiCZUaV0sPXWhU+F X-Received: by 2002:a05:620a:8da:b0:7c0:c2d7:5f2d with SMTP id af79cd13be357-7c4e61138d8mr348039285a.28.1741360695934; Fri, 07 Mar 2025 07:18:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741360695; cv=none; d=google.com; s=arc-20240605; b=DXvK4frch+NQy6O/BuaSD3vcfGLcTA7iV25FN/oYn/fjErWWyZeV4wYCpR2yLCFtXj vRnwBRWLw2KoSCP2LrtMYpz/N10Md/yTHEBJ2+hp+tmdL0GMfF2DmLq2p7X3OZtsw1Gm dKEuj94Hi39teXUDB471Xjyx4XYA0FWU3bMozn7vaj01L5VYMD7rYA3xzJdj0zufotft xE/2Dn1u4/sxqPXNBkfEcHOzhbIWMZuBf3m3dukoa6MkiL7+HtZbJvE6E2k/yB7Y8JSC Bx1lddhnY7qU17l3w+o0anOf/CMHl/XOmE+/q9sgfxLho3QkJwJ1LNmRUfGdmLrT958K sXlw== 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=PLnyOTswVEaIwB5mduyl0BorXeO7LlZ/oZ3CWTRx72Q=; fh=FXtWUx7amUH5pCqcNLOkhTwo5r7IFsByJZRWfWxnad8=; b=fxKMVnE/Fpt8EAZzgaJMPz1VElq9Vvhf6f/3QlKDplwklIt43jlDXLoTv5iQz1ugWM ijSL2iG15G8FPANTZLwVSd/Gu8NjBnKOf+noD9zd1oEjVmX72tDD40vKuv8tfYwhbXZz V2qZ53ihNF/hZgevw51w1DG75kbUQTXGHd8MUMvfmkn7XLaTWWaW19qLmZggzDD+jwpI 74dt+p9kbcQ8z46eoksr6w+iBiwHc7qV+tvbbZvM3GLjqGcYFCJLtCJrAlsry18K10ON rLO+NgiIor/X+yA053s/5MWK45IBFGwNIX4dAYJaAaAffhAkkDFevAycM3qtr2FmSTil I9Sg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vriINjjN; 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-7c3e533a99csi355040685a.83.2025.03.07.07.18.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 07:18:15 -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=vriINjjN; 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 1tqZSG-0006D0-Gd; Fri, 07 Mar 2025 10:17:55 -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 1tqZQi-0005qB-PC for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:13 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqZQh-0003qQ-0P for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:04 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-390ec449556so2400708f8f.1 for ; Fri, 07 Mar 2025 07:16:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741360561; x=1741965361; 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=PLnyOTswVEaIwB5mduyl0BorXeO7LlZ/oZ3CWTRx72Q=; b=vriINjjN6R8Va2N+qXe2ea5pcYBDA4lP7re9T1beXa+MsKZTi5b9XDDL8UtzQ8mUYi 1NukZHvQHg+8hxsoUBNrvlWzDkDAMKZly26NdSA7lvYvPBltj6iVgTlarcMjy1NSg7KE iV5kb9ciyvnZQ6t5jG7N2Avfite+b2V1wZKW8NP+dJEJZM7nAWdaUwFTaE4W7UCJY6uA wCCSJkulotPGRGIt4vKZ2qEURHLS4cqU3lfaKbbeiaXtASSgbkhiR/AXe9600Wk1t/Ez UTKVb4IdOLC27bBgp4W/5J4Q9n2uPjClzlA4lHJsbpUCLtfoSTQxL5KgZZm7W0hnxGTg ovNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741360561; x=1741965361; 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=PLnyOTswVEaIwB5mduyl0BorXeO7LlZ/oZ3CWTRx72Q=; b=Wp/SJmdi1Ft4Ifj86eW5Mbr5qsq/WZRm9aCzqIUPc/L9zytf1QY/qUPYvxe/EsNKLg GEgGBlu/rylRqbH6156FYrAnAQnyTdVSRCLGD+UFm2/LTwh1cr2qbgaB4yYmVKNgySrW bA1M4EC2pUHb69KImz26JaTj1KVzOhwo7WAvKxspKA6sAiRiwYDv93N9U9DvISuMqJbs pwg/LkV5Grfv8+94q0YkUUFeYK2SKWnWTXtz/eSMEH+HFjha0FKQAz7b5Dlsq4DZZePf IDgcoPXylz3U/d8GnU5DsYbIvTWqkNf3p71xpREXXR83ujRTl2JLrOMp0A3PyY4W5rqx czeA== X-Gm-Message-State: AOJu0YzSl9P3oPShyQwoKX09Ks8JxrFQAHogqsheC6tA+jv/lIPbcRwX /9PAm0IulSvT2tl97Nd9vGpHRMFpcYRyeHCW6ZRz/TrVy3O7Zxr7GAxgUStMvIeQaW4QLnqukTq 668U= X-Gm-Gg: ASbGnctDwOQsahy9Gk2npK4r7MA5TCynXnSL+1ua7/k30pP7tIoPXsYK8KPkroyGVRJ N9qlVumjDxnfdP1au3U89C8DlTDkvnBWabgoo+wjhf1zKsRjJ061P0Fg8vZCWG6rpSpwHhoGNNH GwGYPZxiLUYLF6w14iEsuMMZU9ur5I4+ojmboij8ksogP8Ywu2L+9QeOpvwFvHwx/KRn9pLNHC5 Eef/sgkwh1hueuFU4nqN02JyDUO2rVCBJdCBD3rHlDPsY6SD9jtFg+gbBsxQgUz3QESTNKqmsuI BHoT+OTrq9yRmqiX13qzioq3bqtqV7U77b+GOoDl4GH7FCHdQNih/x3Vs0OULjrG2x5ABFO3mC0 YotZ+SDJOsYoERL8kMY0= X-Received: by 2002:a5d:47cc:0:b0:391:3049:d58d with SMTP id ffacd0b85a97d-39132b58ad8mr3788604f8f.0.1741360560624; Fri, 07 Mar 2025 07:16:00 -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-3912bee262esm5625123f8f.0.2025.03.07.07.15.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 07:16:00 -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 3/7] hw/i386/fw_cfg: Check ACPI availability with acpi_builtin() Date: Fri, 7 Mar 2025 16:15:39 +0100 Message-ID: <20250307151543.8156-4-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::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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 Replace the compile-time CONFIG_ACPI check by a runtime one. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Ani Sinha --- hw/i386/fw_cfg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index d08aefa0291..a7f1b60b98c 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -145,10 +145,10 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms, */ fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, apic_id_limit); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, ms->ram_size); -#ifdef CONFIG_ACPI - fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, - acpi_tables, acpi_tables_len); -#endif + if (acpi_builtin()) { + fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, + acpi_tables, acpi_tables_len); + } fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, 1); fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_fw_cfg, sizeof(hpet_fw_cfg)); From patchwork Fri Mar 7 15:15:40 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: 871210 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp814355wri; Fri, 7 Mar 2025 07:19:00 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWsoVtTDM/kRnf610ndZ97miEKVO6MIXIqZF+05zYiqI/krkcE4Y7mx1VQuVUUwPzkV/6kIvA==@linaro.org X-Google-Smtp-Source: AGHT+IG3xayUdP5gef4zzlE5yz8qQ2VM7PWSJOxa69hZHkPa53BsxSKOnPV+mIDxijOXmGvg1l9j X-Received: by 2002:a05:622a:6bca:b0:476:60a1:3115 with SMTP id d75a77b69052e-47660a13292mr3607961cf.33.1741360739956; Fri, 07 Mar 2025 07:18:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741360739; cv=none; d=google.com; s=arc-20240605; b=FW8oARA+8Mph0wREHS0si8fISVdwUDXHeGgbzzwmSKrQkyAY1DngdesHLYnCiqJK8V 4Eq9OsR9QVvY6Fc6sic3B7PJGTeQoCwLrf55vpkzR6SXZvKmIxe/eiHrJ4sbtkby3qjI oDDNHEvZuNk0JUL5k9A1YeecrBnAGZlUk++x3deERkINX8ZUiEN+AYqw9VtJsNyCiHee HCxp/w7VIsWz1D4QJ0LwalzZDscTNddIJ4zgIOP/vFUG5VvaN7JhFVUT7SXiSn0at76F aEGZuZ0++s/SywE9D2fZe/3kZJS/uOKi7kZgO9a47WNjE3OEimUAaduz768/zDBsK2zO NxhQ== 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=PNl8UgOnANk9MlIZCbbjo+hTAONQ4gInW5Qx1vX0kuY=; fh=FXtWUx7amUH5pCqcNLOkhTwo5r7IFsByJZRWfWxnad8=; b=DLbVjneMUHzZ3fQjiyz4TgtqSz3RG7Y9lD/HYkvOKyljgkMl/92MOcAjYosGPLcroM //GFCQthfYGqhwQ2uhn1CmfsWowKt1ZSlNztSemcsxLL2uXttGx7kWsWeyyNSPslOhsr 1RcK8AShC2H2qKTDRl27OpP1Pw35r4O4ztNnGc7DcbOJz0sIuaW8iNRZUuokX9gB8S2A 1FmXS7n/F3F7jFFZK0O657wyjjtgF2sFhi11BWPpCZw9pfkI0a8nh1XmhCVew8aogRt9 A0Y8vBj/8SMx4qhfTJASN2HJ1yJKxg2786+aEPQ1g4f3xEyVCsoFLcGx7jfJ6woEXzEz sywg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="y/Ht3ErJ"; 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 d75a77b69052e-4751daf8df7si34564281cf.208.2025.03.07.07.18.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 07:18:59 -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="y/Ht3ErJ"; 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 1tqZTD-0006Xv-GH; Fri, 07 Mar 2025 10:18:44 -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 1tqZQx-0005ro-R3 for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:25 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqZQu-00040z-UT for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:19 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43bcc04d4fcso12213985e9.2 for ; Fri, 07 Mar 2025 07:16:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741360565; x=1741965365; 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=PNl8UgOnANk9MlIZCbbjo+hTAONQ4gInW5Qx1vX0kuY=; b=y/Ht3ErJQIEPadWhmaSMCXE4IzRQelbF+Kgi0AU/e3jwBiCPWXD4y1b9HFqUJ9mq1t GJyGIIVUW4+C2eNrYJ4594gW18vrow6xJDKJ1910nmUFybkowLpVUDIRtiCuQPZ4fexX zjKeqWmhRn2xUSmwz1gLQnqEaK+/7dvJdAtOlgdyry+eAM9vBoK7Hnwy1GG3KvFfVkzF H/6zyDYwfWWfqTK7mvTdkAK17QKB7fK/dXkF02p22HhzaEN58k1hhgy0BeDDL0tk1dVK R+NLhR2zaagSHzLylwSsewJdXkXuqiquGETHy8Q90+2AOy7G1eTwTOQW+Axv17xrrR3m n74g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741360565; x=1741965365; 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=PNl8UgOnANk9MlIZCbbjo+hTAONQ4gInW5Qx1vX0kuY=; b=t46bI1R5HFbXoAgWIHF8ldcxEjPNHd9WvkvCkbgai7Vukhk/WgTI0omkw5xmDQDcbf gP0LBtWvp/x53Jo/HIysuFcISi5Vx8BLbrbtNn1gDH7hdUk6l8Crag3mZTa+mS6NKi1d 0TGsJhuTNYcODJAeoRCONEL7TEFwoXBoHvhg/wwCA3gAh/awpiqC2w/+lQtfJDEkrbrY QiQFH39WE9LyZZGfTQKz1BRGoRjHf1JINDkY17CUpuA8VgOntdg4RmjzRdsZRFWaxMR/ oEZr1Tbys0IyxTLvdEYsp7qDNQhW4jXWDLm2pG43nmpqOhHcFWq7spEP4SIBaGKhE38V tV3A== X-Gm-Message-State: AOJu0YyqWrffYGHERkMm9jEuujAwl6vAAQUmzwe8FxqGtcIG1s8mF0Ax w6XtEmI5LTF3UT0sJ0dEIVbGMMeOOjHPkURAzWDmpLb9JE11l3WgCcr0bks+PWbg/ddEzzFmM4W 5PWA= X-Gm-Gg: ASbGncsih3F701GptxRkunvjcBxdy1QDzCSrggOlqRfS1aAQ/fhp+DVjl2tS9Da8/gP rlfrejexYR4QDghfGYu6Ke8JhEjuYzmbFJWlvSNvY8psZmAUyhMhOYQji4M0hWABRCi8OiBViZB upc4BQL5vXaTCz9xmp6c3I3Jdt0/BCzS9pW5HTlJ5N0U+Rr4y0f3KeQ5yQdA2RFs8n1PnnhisxC vwbJIyf5nMIhsXkk4QEUSX956dfV42RDGRgbUxvosjHkN+hbcuiXrObm7VvzhGFtmC3Yrr/33/0 lv7a7dReT3MlrsBzOp6EihiebiecOVVVgqpXRcIXZLauyaMldZqURhAs0+dAlsX/bTgsop8nXPS uit1Y4zC9b1qaUNVlY4E= X-Received: by 2002:a05:600c:444c:b0:43b:c7ad:55f0 with SMTP id 5b1f17b1804b1-43c601cfdf5mr33222165e9.5.1741360565544; Fri, 07 Mar 2025 07:16:05 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43bd42c55f2sm84148105e9.20.2025.03.07.07.16.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 07:16:05 -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 4/7] hw/virtio/virtio-mem: Remove CONFIG_DEVICES include Date: Fri, 7 Mar 2025 16:15:40 +0100 Message-ID: <20250307151543.8156-5-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 Rather than checking ACPI availability at compile time by checking the CONFIG_ACPI definition from CONFIG_DEVICES, check at runtime via acpi_builtin(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand Reviewed-by: Pierrick Bouvier --- hw/virtio/virtio-mem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 7b140add765..5f57eccbb66 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -28,7 +28,7 @@ #include "migration/misc.h" #include "hw/boards.h" #include "hw/qdev-properties.h" -#include CONFIG_DEVICES +#include "hw/acpi/acpi.h" #include "trace.h" static const VMStateDescription vmstate_virtio_mem_device_early; @@ -883,10 +883,8 @@ static uint64_t virtio_mem_get_features(VirtIODevice *vdev, uint64_t features, MachineState *ms = MACHINE(qdev_get_machine()); VirtIOMEM *vmem = VIRTIO_MEM(vdev); - if (ms->numa_state) { -#if defined(CONFIG_ACPI) + if (ms->numa_state && acpi_builtin()) { virtio_add_feature(&features, VIRTIO_MEM_F_ACPI_PXM); -#endif } assert(vmem->unplugged_inaccessible != ON_OFF_AUTO_AUTO); if (vmem->unplugged_inaccessible == ON_OFF_AUTO_ON) { From patchwork Fri Mar 7 15:15:41 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: 871212 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp814651wri; Fri, 7 Mar 2025 07:19:41 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUyphT14NgbqK9I+YHqa3LpBZ1swdVVsF4IKdEjrWtl7Gkts/qI5TpwzYNtk9EVIeNajMUJlA==@linaro.org X-Google-Smtp-Source: AGHT+IH/0DpPxEluSo8RhvuJ1/uMlcewuYOMgdZHxxqVgm7fx58H6wmOJDR8WAF9IZEgGhD+S1bW X-Received: by 2002:a05:6102:2927:b0:4c2:cdf1:7c0d with SMTP id ada2fe7eead31-4c30a54cffemr2491547137.7.1741360780786; Fri, 07 Mar 2025 07:19:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741360780; cv=none; d=google.com; s=arc-20240605; b=UHB172Ijk3jfZsUDDNeJ7+yuqPrKr1ngm99lF+LfaGP5BUgBTmuvhkhdo3np70gCbz 5Ufn7cvoqJFQQ7IkF4tDarh2ymftcoFUkioUmez0LraSO/WM652Z4NqNTgdJQ+El9Il9 uZN/EPjJ5ilPp8d1EQuQgOhTFcVq5rd3A2p7q5TKns+lCLzh2IlrMT4sP8ffI4PAsEPI SH6vyRYvcxRllQ1oBRuNOwh2sFWxZDikcNEnt9NKStJm3mmMzppGDYCF4U65fYRuXbne 6j+iTxBXXPO56rx8DI7r+X4xyCL/rP5iTZUz5I0V9XNHTYUooufBltly5K3HiQIYJ+YF 2faQ== 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=F7c3iP1EwbjahBsBwJBDuZ0vBFhZFt0AdLkeHdIl4iU=; fh=FXtWUx7amUH5pCqcNLOkhTwo5r7IFsByJZRWfWxnad8=; b=BjYSjHnWCl9jFQ634KG2q6ZhSgZGtYTDCnOiZd0u0k+IvsqtsF829lGRwDbVF9CSXv p5qkTv9Wp+h2De7V6079BP/QJQc59rkJJh/HoGgK3Acbv05xiACuFemBSYsZPEc5btP7 NgqIK+3JcEkyXIwYHgNjHwoAVJH/QuqWa/AIreUkzp6h20zIqHBbHEsZ55RpE/rSTIo0 gYD66lEwldnPaf9dFeYizAb0+NeWeEUiXCnMrXEPPOWn2OA77yPTVczF5hjw+3s9qB6k 7VlQjx/UsGA6UiMGZvnTd3xCQlMiX/6jWoUVFkAG3CHf1v/AHxgvQTSRHPh+esBm43UP tjsQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=I+AqqkYR; 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 ada2fe7eead31-4c2fbd1b3b7si996319137.538.2025.03.07.07.19.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 07:19:40 -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=I+AqqkYR; 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 1tqZU5-0007hq-GA; Fri, 07 Mar 2025 10:19:33 -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 1tqZQy-0005s1-R5 for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:27 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqZQw-00047t-1d for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:20 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-391342fc0b5so1120644f8f.3 for ; Fri, 07 Mar 2025 07:16:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741360570; x=1741965370; 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=F7c3iP1EwbjahBsBwJBDuZ0vBFhZFt0AdLkeHdIl4iU=; b=I+AqqkYRu7/BYHT85Yd6zARaMRV6QX/mfoN2+rzXjt4TbPKmXN5wYnnlr8HO3tef63 xnS8AgudIH3YnVSU4GDI4luyxNFQzT4VOxWzqbkwGW3PZzv1IwlQtBbiGfjQxb98udFy uwwAZB9xvu29+oFn1wbWDvWja9p2elbOFbOKR73P4Ab6+7wO+oDLkaedW1pU0q0I+DLH s/79x3DLtXXpXG2ApNYVitnSS3XEE8mVn+DSbZdV6KjZOPHXN0QAK8+c8lDlqdKWGmjE k5T2H8KVuItbKLfHijW1jI0SQ0QHSc4D01D6yb6fn6Ku7BYNq9n2D/qf8kBA4tv6vBDm RJ+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741360570; x=1741965370; 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=F7c3iP1EwbjahBsBwJBDuZ0vBFhZFt0AdLkeHdIl4iU=; b=VOYzrOYuNqVseZgJhH66apPbJWa9yjfBJYZpl8nUYzesr+IJwK2/yn42EV5f8JZdku jK3OqkTW6bPhzdX/0W7BpYW2rdVQmaWN5MmgjDstvpa+Qr8PMjKci3dAwN46ja1gOLwo 1pjj/cWYzkSXUW19UmQ0rtjUdmAbnHrVL7hxljVCpLiN23l51RhEVoIEwprqNkSaba+e AO9hW4UR67R87azpMfvXhCy3Ty2QdfIqLKMwzWKeFo1wWNVds2LecJTN9F38xlIr5bzv 1mbET9aM5zdynmMFywC0YYVtWp7xUV0osI39rGVuwoixRfvYy2jQmo5MvyZ1VF0mWl9/ KNOA== X-Gm-Message-State: AOJu0YzQkl96L4MK7LSGFGpwOCJbVHKDYD3BXJshyukmai4V7tRSoYUy tk67b4N2Dx6d9AKYl1FlEkDJPOgnbHtc/niGxOyPWTOx59xZFqOdiN/Pjacv4eF5x4N0LBaF39A 3X+M= X-Gm-Gg: ASbGncv9eUATy4BYr9VjVd5xKSCQXr7wh49KZfnN4MYcWzWsP1/PP/K2M6QWo3ZHAej fvk+RkOHSP3DbbARNDvyEwIgkuu0i7HUUVZvfQmr+n5R00jW3qW08rguXvQVIpnbf96EqNgBEiP A6o4UPQdGLP50I2WthCJnWjt5Gd5TavemiiyczVlv/PLqa8dlInMpB+j9Tx7f+b4VPiDkqP/ZVp kLInsh4TCkEMtl7XYd2SUQCCcNhaqmxnEDSNvSLGpAnF2SoWaMUtE2SIUuZCcm8Ig6eepBkamaf x0zWfiLES8oHUVt4ANYkXvsdK/ks8Q4j4vUa7W1XrG810brNPAQYdm1ogT4aJIYX3VeDM8fMqvz 37TofKp0j51CKzvYLPSg= X-Received: by 2002:a05:6000:1564:b0:38d:d666:5457 with SMTP id ffacd0b85a97d-39132da24cfmr3211167f8f.42.1741360570445; Fri, 07 Mar 2025 07:16:10 -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-3912bfdff72sm5699359f8f.36.2025.03.07.07.16.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 07:16:09 -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 5/7] hw/virtio/virtio-mem: Convert VIRTIO_MEM_USABLE_EXTENT to runtime Date: Fri, 7 Mar 2025 16:15:41 +0100 Message-ID: <20250307151543.8156-6-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::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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 Use qemu_arch_available() to check at runtime if a target architecture is built in. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- hw/virtio/virtio-mem.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 5f57eccbb66..8c40042108c 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -15,6 +15,7 @@ #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/units.h" +#include "system/arch_init.h" #include "system/numa.h" #include "system/system.h" #include "system/reset.h" @@ -170,13 +171,16 @@ static bool virtio_mem_has_shared_zeropage(RAMBlock *rb) * necessary (as the section size can change). But it's more likely that the * section size will rather get smaller and not bigger over time. */ -#if defined(TARGET_X86_64) || defined(TARGET_I386) || defined(TARGET_S390X) -#define VIRTIO_MEM_USABLE_EXTENT (2 * (128 * MiB)) -#elif defined(TARGET_ARM) -#define VIRTIO_MEM_USABLE_EXTENT (2 * (512 * MiB)) -#else -#error VIRTIO_MEM_USABLE_EXTENT not defined -#endif +static uint64_t virtio_mem_usable_extent_size(void) +{ + if (qemu_arch_available(QEMU_ARCH_I386 | QEMU_ARCH_S390X)) { + return 2 * 128 * MiB; + } else if (qemu_arch_available(QEMU_ARCH_ARM)) { + return 2 * 512 * MiB; + } else { + g_assert_not_reached(); + } +} static bool virtio_mem_is_busy(void) { @@ -721,7 +725,7 @@ static void virtio_mem_resize_usable_region(VirtIOMEM *vmem, bool can_shrink) { uint64_t newsize = MIN(memory_region_size(&vmem->memdev->mr), - requested_size + VIRTIO_MEM_USABLE_EXTENT); + requested_size + virtio_mem_usable_extent_size()); /* The usable region size always has to be multiples of the block size. */ newsize = QEMU_ALIGN_UP(newsize, vmem->block_size); From patchwork Fri Mar 7 15:15:42 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: 871211 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp814384wri; Fri, 7 Mar 2025 07:19:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU8+IUCnBHTt9rPWF/aHf5cj6ZgPhcOAs89qS9FhckZe+0gUQ6Flgyh3Ft/eZrArAF9oNDbSg==@linaro.org X-Google-Smtp-Source: AGHT+IEy2MGyhhrELGEjFrLLqA2+Sr4NMAePTrr4hvlZbZMaYToxoU5vwZT1w4fLi+u/V9MI+wQz X-Received: by 2002:a05:6214:c8d:b0:6e8:8e10:4243 with SMTP id 6a1803df08f44-6e9005bc7efmr48936096d6.7.1741360743251; Fri, 07 Mar 2025 07:19:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741360743; cv=none; d=google.com; s=arc-20240605; b=dYz7jh65zvXj9Fsv/mS5dXaZ7LSEAX9XGCH4BxE5W/SDnOWLr5N64bgLH+EGF4l2oT +8Qz2kqc3riD3PQI4DmYoaSzH4dwIbdF3svbxN1FE08lCAuXAFi18iw+Pj5r6pc5Ncdl gEK1e073YfXvN5jS0qFZZ3chgXGKnRWBAvjKiIwaaT1diIO6apSuxpDRuaEtsI9Q4eRz SU91S/Ys3yJduk/PuRB95MmvXePLmP1wXJ/OIIR4yG7LPtjepDRONq3BO70k305IbHkb ct2/fHkM37xynqakTrJGPUvdJmqDwwV8/E+VHH2YhY3EZFRovvaKtrR2G3IKjD6LIV9I 5Ltg== 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=Z1uU98vkFyVYQQHlVh6XdUyWkVqbT01dB2myaHB4+ng=; fh=FXtWUx7amUH5pCqcNLOkhTwo5r7IFsByJZRWfWxnad8=; b=WU2H0Cc5DByhOvGhHhKZjgVRwIXqw2b632bSaXzA8gSxf+8+o4YqNennmz1lnRjduF QZITBfKhqlOdBO89bX99VRNrvukQUkLUldudNPCp03GKaxYQDWS3AnKDlHv63uDZC73H ILZqOLAaVh03fb85Hjm18piP0KrH4pQLSN1sk9fy9iG31eGRnPmV1lc4ujy88MyfiJ6a fLEVlbv3WRSLH0lKiyiKM8tViWl/SfRvLbHG7eHW/TVIk4YT9fYL3c34jTsbHKbI5UVs 3aYCOGTTbMZ0EmRvUskENwsRCfgNtOYFul0q+gA3y0p0/jyqJRrXtVDeyhXaFNAGGq+o /4oQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hixADkPq; 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 6a1803df08f44-6e9072b2f81si2772636d6.437.2025.03.07.07.19.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 07:19:03 -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=hixADkPq; 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 1tqZTN-0006nG-Q6; Fri, 07 Mar 2025 10:18:55 -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 1tqZR0-0005s5-BC for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:28 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqZQw-0004DO-2F for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:20 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43bc63876f1so16802265e9.3 for ; Fri, 07 Mar 2025 07:16:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741360575; x=1741965375; 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=Z1uU98vkFyVYQQHlVh6XdUyWkVqbT01dB2myaHB4+ng=; b=hixADkPqGy+G5+d9vJzySFznTTsVJRoZ8Qa5TxYdx6sgmH/MlsirMl2M2PcsHsr0sW ZE93RW604wcXTW8LcPty7BRRmV9jM0dqd1+gr+jEeU3TdVLoJVnfXHNvM5Tf8YUG07cT 59D7+XQfsaYwd/Vb9D/teSivNC+PLq7c3xBN6sWUAx75R6FP8ki+TSESv4l3Z9mbUVpk 4u6yNdOSIROEkphRwUI5e5xkZmRovWt6CW/aGroCETpWMCVOTCysT8dAMKsbmM8YhCKg p7MXpmftQyJcA5gn/iKE2FjPZ3XntVns8v/LwrO2EQEfImxDGV+pkh1lAxz4w7ZRmhBi 5rlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741360575; x=1741965375; 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=Z1uU98vkFyVYQQHlVh6XdUyWkVqbT01dB2myaHB4+ng=; b=MxxbFi13HQLDOLr8jq/lxJ9PxaI2UUJMA4h7sG7qXaU1/ukjjXH6VdDVB/5FWp5/BI 4bTMGHHcJdyCoUHWw5tOiJ5KuOXrcpmsOKdcF8afwqHoichcKpcBUt2RFnM6CSnjYj7a L6JiL4byQEepbs/kvTdOO0+iEnBpn3B0Qzx5Mlqd//ngoPaAYUabmY5kVxszSnHyn9BQ a1iem4+5r4nFL1UMa8Kk6aCLadDzYT64rztZOEuaxSVIyl8B9aP+4oKj7hbaGJsH8R17 C6FC8MV9+UHdPDw4k3vX7HVFc4R47kAN16sQzLn0vHgWYj1KsASMWXhkK0z7ImdjhXeg XGKg== X-Gm-Message-State: AOJu0YzUOXe+U+K0UCs8Y2c8DPwNoUydLCsyww+8Lk8i9jDqulqh61DM gcQgVQ+zyk3MYf/WGrWGlNMsPh1o4Ta+jsdSLbRp/n8oe+K+6C9/bsPssoi0Ke1jMo+EoJPG65t USlk= X-Gm-Gg: ASbGncv9onDLEHn30BCTAz4+Ye/t5BN3XVAppTvHH26mL5adBKgRI4bbFjXwbyvT3Uz 3qbK44+N01zCQj4yHMogJn969WFZzTUCAv7ORR+hJG7QSF8NsgDUmQD0ffumzFpadbzcB83emvp eqipsRqE/KezS93VK3vLgJyXHnxf4QNIjgyklcN7eQn1CDYCzxWq9/zpgdShdQKpboSMXsm5Ojo q3WT9up2UGC81u2zC/McUpBG/jytI78TV+ECAc5DUxN+omZdz7oMgqaA7oLiTqTvEbicQ3fd0Zv GfvR25QH1VZI+87Ctdlt4VUmk64DWNYsZpOFVO5SBkFBDPZgUtypv8QXDoZ2uDVANwJaCSJwTuD RenfHj3Vb1+WHBWjteQA= X-Received: by 2002:a05:600c:3b0e:b0:43b:d04a:3506 with SMTP id 5b1f17b1804b1-43c686f703emr23532445e9.25.1741360575315; Fri, 07 Mar 2025 07:16:15 -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-3912c10437dsm5715023f8f.99.2025.03.07.07.16.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 07:16:14 -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 6/7] hw/virtio/virtio-mem: Convert VIRTIO_MEM_HAS_LEGACY_GUESTS to runtime Date: Fri, 7 Mar 2025 16:15:42 +0100 Message-ID: <20250307151543.8156-7-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 Use qemu_arch_available() to check at runtime if a target architecture is built in. Register virtio_mem_legacy_guests_properties[] at runtime. Code churn in virtio_mem_device_realize() is due to re-indentation. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand --- hw/virtio/virtio-mem.c | 61 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 8c40042108c..ea7229ce28c 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -38,9 +38,10 @@ static const VMStateDescription vmstate_virtio_mem_device_early; * We only had legacy x86 guests that did not support * VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE. Other targets don't have legacy guests. */ -#if defined(TARGET_X86_64) || defined(TARGET_I386) -#define VIRTIO_MEM_HAS_LEGACY_GUESTS -#endif +static bool virtio_mem_has_legacy_guests(void) +{ + return qemu_arch_available(QEMU_ARCH_I386); +} /* * Let's not allow blocks smaller than 1 MiB, for example, to keep the tracking @@ -144,7 +145,6 @@ static uint64_t virtio_mem_default_block_size(RAMBlock *rb) return MAX(page_size, VIRTIO_MEM_MIN_BLOCK_SIZE); } -#if defined(VIRTIO_MEM_HAS_LEGACY_GUESTS) static bool virtio_mem_has_shared_zeropage(RAMBlock *rb) { /* @@ -155,7 +155,6 @@ static bool virtio_mem_has_shared_zeropage(RAMBlock *rb) return !qemu_ram_is_shared(rb) && qemu_ram_get_fd(rb) < 0 && qemu_ram_pagesize(rb) == qemu_real_host_page_size(); } -#endif /* VIRTIO_MEM_HAS_LEGACY_GUESTS */ /* * Size the usable region bigger than the requested size if possible. Esp. @@ -1001,28 +1000,28 @@ static void virtio_mem_device_realize(DeviceState *dev, Error **errp) rb = vmem->memdev->mr.ram_block; page_size = qemu_ram_pagesize(rb); -#if defined(VIRTIO_MEM_HAS_LEGACY_GUESTS) - switch (vmem->unplugged_inaccessible) { - case ON_OFF_AUTO_AUTO: - if (virtio_mem_has_shared_zeropage(rb)) { - vmem->unplugged_inaccessible = ON_OFF_AUTO_OFF; - } else { - vmem->unplugged_inaccessible = ON_OFF_AUTO_ON; + if (virtio_mem_has_legacy_guests()) { + switch (vmem->unplugged_inaccessible) { + case ON_OFF_AUTO_AUTO: + if (virtio_mem_has_shared_zeropage(rb)) { + vmem->unplugged_inaccessible = ON_OFF_AUTO_OFF; + } else { + vmem->unplugged_inaccessible = ON_OFF_AUTO_ON; + } + break; + case ON_OFF_AUTO_OFF: + if (!virtio_mem_has_shared_zeropage(rb)) { + warn_report("'%s' property set to 'off' with a memdev that does" + " not support the shared zeropage.", + VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP); + } + break; + default: + break; } - break; - case ON_OFF_AUTO_OFF: - if (!virtio_mem_has_shared_zeropage(rb)) { - warn_report("'%s' property set to 'off' with a memdev that does" - " not support the shared zeropage.", - VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP); - } - break; - default: - break; + } else { + vmem->unplugged_inaccessible = ON_OFF_AUTO_ON; } -#else /* VIRTIO_MEM_HAS_LEGACY_GUESTS */ - vmem->unplugged_inaccessible = ON_OFF_AUTO_ON; -#endif /* VIRTIO_MEM_HAS_LEGACY_GUESTS */ if (vmem->dynamic_memslots && vmem->unplugged_inaccessible != ON_OFF_AUTO_ON) { @@ -1715,16 +1714,17 @@ static const Property virtio_mem_properties[] = { DEFINE_PROP_BOOL(VIRTIO_MEM_PREALLOC_PROP, VirtIOMEM, prealloc, false), DEFINE_PROP_LINK(VIRTIO_MEM_MEMDEV_PROP, VirtIOMEM, memdev, TYPE_MEMORY_BACKEND, HostMemoryBackend *), -#if defined(VIRTIO_MEM_HAS_LEGACY_GUESTS) - DEFINE_PROP_ON_OFF_AUTO(VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP, VirtIOMEM, - unplugged_inaccessible, ON_OFF_AUTO_ON), -#endif DEFINE_PROP_BOOL(VIRTIO_MEM_EARLY_MIGRATION_PROP, VirtIOMEM, early_migration, true), DEFINE_PROP_BOOL(VIRTIO_MEM_DYNAMIC_MEMSLOTS_PROP, VirtIOMEM, dynamic_memslots, false), }; +static const Property virtio_mem_legacy_guests_properties[] = { + DEFINE_PROP_ON_OFF_AUTO(VIRTIO_MEM_UNPLUGGED_INACCESSIBLE_PROP, VirtIOMEM, + unplugged_inaccessible, ON_OFF_AUTO_ON), +}; + static uint64_t virtio_mem_rdm_get_min_granularity(const RamDiscardManager *rdm, const MemoryRegion *mr) { @@ -1877,6 +1877,9 @@ static void virtio_mem_class_init(ObjectClass *klass, void *data) RamDiscardManagerClass *rdmc = RAM_DISCARD_MANAGER_CLASS(klass); device_class_set_props(dc, virtio_mem_properties); + if (virtio_mem_has_legacy_guests()) { + device_class_set_props(dc, virtio_mem_legacy_guests_properties); + } dc->vmsd = &vmstate_virtio_mem; set_bit(DEVICE_CATEGORY_MISC, dc->categories); From patchwork Fri Mar 7 15:15:43 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: 871213 Delivered-To: patch@linaro.org Received: by 2002:a5d:64c8:0:b0:38f:210b:807b with SMTP id f8csp814666wri; Fri, 7 Mar 2025 07:19:43 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXPAUSJBPVhB3UP8XNypY+/8q3qKbjO10WSwrE8VbDuryZTH7wSPk9pqjEv4vm1RauaUte6jw==@linaro.org X-Google-Smtp-Source: AGHT+IGIutWNELYEp8Cn3heksJzdThyJ+6+/qJf5ZMlvVxq4abpFxjwERDEh8WVoU119j05m1dgL X-Received: by 2002:a05:6214:2425:b0:6e4:9b59:d9ce with SMTP id 6a1803df08f44-6e9005ad731mr46062766d6.5.1741360783306; Fri, 07 Mar 2025 07:19:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741360783; cv=none; d=google.com; s=arc-20240605; b=RyVIxQm6z5wRYsgPcFKN0ooFZpArPSq+Jin1SmSihB1U1FTN09J71U50KgVvaN+SjZ P4sbelMPignBNnbePs5HPE0UnOmg4lA+E5cZLdB7HlrhE97RWRNETKvybh9yPb2oYOSg 8drjftpzMxKYns2zN1llC9CB3Mj7dXwqRF722q77UQNjJE0AvIWzwrN/0QpmONU+zTA7 0OfywGkCZjmQygyd6sPV3xDMCuGYbtC3dIEun6bfXcIqk/yuJGWmZ064mtISaGA7qUQz VXmdnkowbEmAU7dCKKJSOJc4g9vU3Xssbg2cWRQTz2We68rd8WGoibN76vhmPElPGHIQ 9PFQ== 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=X2M0a517d1Rlrjf61qw++CyqLYHK0smyqzlvRXusipU=; fh=FXtWUx7amUH5pCqcNLOkhTwo5r7IFsByJZRWfWxnad8=; b=AsHHSVKWyl7gtSGa27azhGvte/mULFfDMKJjRkw6eX4+NuV0TFiuz+UcI9gAHnvlh8 VYy244xg/tj0Yacih08yn3t36qlV5ugLTalAFKYD4eMuUI4qsBEohc5WtVD+ZFkzCRVT zSA2sdqQFfS7Suyf/13rVqasr2qeXRR2pgtE2JboI6oRgYYW8gsqzYgQlMbWY1ODPszA vqcXFTKp0n9veDFA5uc3tHRxyN7j4X1fwhI4xPARxnKYLnOcCOvbFeE8hvNggBZbTn8P LNIUD0JgFpVoTe0c1ECLhJEW0Tp0JjjFBlPH+CtskjLiA5AwBkOTKFR/5JfM7f6q4BfG Qj1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ntMcKTzO; 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 6a1803df08f44-6e8f7172678si34542026d6.269.2025.03.07.07.19.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 07:19:43 -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=ntMcKTzO; 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 1tqZU9-000838-Fr; Fri, 07 Mar 2025 10:19:37 -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 1tqZR7-0005t6-5O for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:43 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqZR3-0004J7-0Q for qemu-devel@nongnu.org; Fri, 07 Mar 2025 10:16:27 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-390ec449556so2401433f8f.1 for ; Fri, 07 Mar 2025 07:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741360581; x=1741965381; 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=X2M0a517d1Rlrjf61qw++CyqLYHK0smyqzlvRXusipU=; b=ntMcKTzOF+7AN04NBz90bvNZZqfi5AobvL9Ctf+9qlmW2vH6tWZkaxyKnxY7dICY6h vcxayw+4uj4KiM8DBYxmKthMsL6gMdgjJfvn5J4Vb5MOPede9SVlFdqviuyZK/9K8A6j rykEkc1ZHxuDsEO0IhjLzPHNQtDNiPKqRuHV5GveHtYYTd/nAmawgMEVqcw1UKuv0pbh UY4L/FKiGphwhyiXufBlGUXUXUFiriuTe/sg2VEWto3tzn7+kPBPcsXItMS1i3CaBQnJ Fl36o82MtM64axER7odQjBQOh2pDC8JAHwLlEqpBVcS16UJ4933ttKBePg1P2LdDAwLD 3EwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741360581; x=1741965381; 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=X2M0a517d1Rlrjf61qw++CyqLYHK0smyqzlvRXusipU=; b=dfZdjiQx6H5i5PAkUpp3ZRNWFcKV43kcZ7rCYGkrKZJXBPgkJcjNC8ZElFWC5kLBG2 lhEp5wfxvv8Qd79Qu9aGIBCPPjcoAQ8VNY894ojrChh7OJrUaQe+XuDylSW+xWhGlOwg j3R23hxsae5XarUcjuHRzW3pdKxIUrPZlDs5RGGIDr61T7B8DGk0nVaIOA+ELkNX+ZTC bZtyHMNuwmEzIIZxtXC3ytK2m9x1qRROf6y1pcA/lJShR4bSazpoIr9xlVgH2HTDfL9n ija2KSRU8r0pDC2ngt3SPgnkzufrEx5DtG6uI8tK/6/aCl1oLoAR3QXb0ptqyXU86juN NpsQ== X-Gm-Message-State: AOJu0Yx8H9HhAsTL0zsHoC7zNh5/em/XfVvSr/0sDMZJUu3NkskfUMth y9eLDSIjPx9+ywp7Jotk8jE/gU5Ozmf8Hv2Kk4LST9oudsoFdR2QhQ8qawdkj2+pcCM7wvpd3R8 lD10= X-Gm-Gg: ASbGncuDaSko5hyF4sCIM+13GjGEZ8T9lpVKNaoRs2z2hDbi8r2xKLmM+3MQCvRsRDb 9gpGUBiYCNEjPlp1UYPyCrTODwwXlPtl2f+EACwnCByqpN/MnAqpsu1Yc3ZAKcMlxs7l9TRTmZQ IYbgD+wvXZBUJtg9E0HjMYsiA/zdCUXwPbIzjpMBf39R6n4WernED2RM9BjI0d7oNXLIbCQEgo4 mD4hUh1+1QLQS9DdzxrOz1gn22nwZeuQZRksXuCQF6uiz2lhgh4SUUiLP/RQIOtShKRHxxQilZX +36Lq9I/BSVIutH29b8NAK2pd039ouJhue3BbRzuVsL+/fx8kTTBqd8/FDX51uqk1mU+EX/pFc2 oE94g5JeKCi+k0PaznX8= X-Received: by 2002:a05:6000:2108:b0:391:22e2:cd25 with SMTP id ffacd0b85a97d-39132d7290amr3197152f8f.31.1741360580240; Fri, 07 Mar 2025 07:16:20 -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-3912c1037b4sm5651435f8f.92.2025.03.07.07.16.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 07:16:19 -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 7/7] hw/virtio: Compile virtio-mem.c once Date: Fri, 7 Mar 2025 16:15:43 +0100 Message-ID: <20250307151543.8156-8-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 Remove unused "exec/ram_addr.h" header. This file doesn't use any target specific definitions anymore, compile it once by moving it to system_virtio_ss[]. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: David Hildenbrand --- hw/virtio/virtio-mem.c | 1 - hw/virtio/meson.build | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index ea7229ce28c..a5d732ac6d9 100644 --- a/hw/virtio/virtio-mem.c +++ b/hw/virtio/virtio-mem.c @@ -25,7 +25,6 @@ #include "hw/virtio/virtio-mem.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "exec/ram_addr.h" #include "migration/misc.h" #include "hw/boards.h" #include "hw/qdev-properties.h" diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index a5f9f7999dd..7c3513315cb 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -55,7 +55,7 @@ specific_virtio_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock.c specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_RNG', if_true: files('virtio-rng.c')) specific_virtio_ss.add(when: 'CONFIG_VIRTIO_NSM', if_true: [files('virtio-nsm.c', 'cbor-helpers.c'), libcbor]) -specific_virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) +system_virtio_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem.c')) specific_virtio_ss.add(when: 'CONFIG_VHOST_USER_SCMI', if_true: files('vhost-user-scmi.c')) specific_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_SCMI'], if_true: files('vhost-user-scmi-pci.c'))