From patchwork Fri Mar 7 22:39: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: 871282 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f8d:b0:38f:210b:807b with SMTP id hj13csp2847wrb; Fri, 7 Mar 2025 14:41:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWKH1BJMv0prRk5mCj0qTk/E46HOFddswcu4iHV1fI/2eXu5EKoky3uFXZP365lEEEZpZR55w==@linaro.org X-Google-Smtp-Source: AGHT+IF08XfEbhKvyysxWfMfkhNxjAygmOSq46QHaFyibmrB290lHWz1w0wy/gm7nx3HFB9T7ghZ X-Received: by 2002:a05:620a:2448:b0:7c5:c87:def6 with SMTP id af79cd13be357-7c50c87df44mr568857785a.0.1741387273795; Fri, 07 Mar 2025 14:41:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741387273; cv=none; d=google.com; s=arc-20240605; b=h+WXXGtYbxDlt+orY9TXBosJZL0sLFFseoHEd2GXyAvy/KfSZnpZb5spRMeyKdhaid u8RZ13l69gpNioHSaUz8wf6P6dAbjJjN0z63tGglGwDgdWj5eDbgNIEDBHYt1Y8mlk/T qUw8ftOw/DUXFAjxfi6DetgHNfFYudvBjyQBYQU6hbqpB4WwJHpo0w5z0RjMyuuh1iGh svS2P6t4x9qaS53Kkoov4AdajBphKbKOZgffC7HvZIOYmfYZwVtPUBzLyL6BkeYXyUGV oiu6F1rqP9KojdCtWHWvZDToxPhRTSiFmwtEZPp0KsiAFJwbzC7Z/HQqEuVh6IqQnukn REXw== 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=5sZHRtAv1g4cZ6ovoEOjlIwCffzjyNuuBfnrj4TqsM4=; b=fWqvVmCTbqsFpzKpjS0zSKOHfz15z66q7fE4nr3Mu4BZ2iDHup5gb2bWRV4FXyrV7w dVmk2hnHLvaCkpgO+doxmq7j+7PgNVwWUGbosOZveTZqNoSiF5bSaDH6rD1vBnsfr9Fz u6sWbG5LAVfGIvlCFTOarD9mj3RIINLY7dam9VUhjYXg03QMICA0+ywqayK+bDHXI4xW SKfbd072tVMqTJnpsDQwOcVsS2vinSmaiv9EX9/9lRW/AIuL9hrLr8e//qcv8Cvr23Vl E1JXXRylpc/Hg5WF0ro+G49sYHCWBqzu6lu8ICFtZxDeAkzp0pEqGWDGm+sjk9tE+vme SIfA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zhZQ6zy5; 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-7c3e5545f6bsi418059285a.524.2025.03.07.14.41.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 14:41:13 -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=zhZQ6zy5; 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 1tqgMM-00065G-ME; Fri, 07 Mar 2025 17:40:02 -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 1tqgMK-00064K-3Y for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:00 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqgMI-0003Mt-5K for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:39:59 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-43bc4b1603fso14698375e9.0 for ; Fri, 07 Mar 2025 14:39:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741387196; x=1741991996; 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=zhZQ6zy5585DIFj0jt7j+a6ajOlJRE4LLuuBTVzXSzpQt2mje5U7RQidZ+q+veq5H4 CW6u9hdO+8n0+TD3HPo8Wuk4xG1NbFH5GP7rg/r8asaH+EGfWhUhzkuJP+nUDeNXM1zX Co4yttQfhCh+cGRqzO1mgsvoRmcOlXQ28R23GZEd+tH7F3aI9Z/unIjGgLKPneG889h9 93787WWOpHsk0VmOqrbemqPR6awSw2OKaRA+++dWk4o6YDMlHfLtMBTbefmb2GE75aLJ DW9Tz4jleAhpR/NcIDwmIvEVUJ92Ba2pFcjdvpF8EDrIIyy2Bl7LYiW/GBE28zn4s/wU M6tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741387196; x=1741991996; 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=fhhhELJ9DLrJm1/WV19iZ3CXmOaMvqzvs6z9jinpOORMMRHbg87ftZ6aQavE72oquT Hcko8frMvxhKFTCpFJKCMJ5uiVkIbaxZF84knWUJXH1CKDl97fHW1PmwcUwH96jCTXfz rR9l9g/NkpvCbWozXPNzXD2D5W9ehJA5UAN2dBCAjoh4RRjIowoofj8OdYqYnASeWITN UeuKPEjfjwhgVIpChgflIuGNc59Gzd/nMP0JwC2kUhoS/JyJ3/rZZDObOpC9jLNfQJI3 VcL59QePywgF1AtfWV0bOQdh07bBCHbfIWEybL5WqqzHwXQe7Dyu6EVp6Cz0DzChSwVf vNkw== X-Gm-Message-State: AOJu0YzoU6W6swrrouOgTJMc356QFpo2T11ASSispLFp+yLUlR6qf5Ph +aj/99r0FTEXctH5w8sEpB7l5pnJCanxMUE1Zpw0jlqWndcHP6aGWbNUFttsQZL42PAhP6xpabN tQ7Y= X-Gm-Gg: ASbGncvDs91Hk9gDSfej1TAHQKGrNvh1p5TyVy1J/FPJP1SVyr1yhNURyF0yA4ideDQ OIUHUuyBJ9f/iO8K2cBeEqbl4G8ivohVnHmLy/PHhrpkptYOg8yxoigTCBfUbFLFr46v8Akfp+/ yGOD7Fw/q6y0hUBoQsza7vnLNzz4DeraYxmzr85CyQ1qYWtQyONlIbKrG/JZ4V+cGztRmBwB0UF oDaayleBX4SiH6/cfTiAr9/AybLoZPps4eOZzJM8pu7xv2DIsrQtMa9JhU9OEDMh/TXLNWdSQMx Kom1EGRndCFAQ6Z/DPQOwSIsNPhKXJrQQ5gVxxIA+kPTY9FsMz3VA1RAzaeHqNTdSsGRQme0jTH AyTZLx3gxDu9hqFnflIo= X-Received: by 2002:a05:600c:524c:b0:439:a093:fffe with SMTP id 5b1f17b1804b1-43c5a5ff0c0mr37827405e9.7.1741387195759; Fri, 07 Mar 2025 14:39: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 5b1f17b1804b1-43bdd8c314asm65349195e9.10.2025.03.07.14.39.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 14:39: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?= , Marcel Apfelbaum , Igor Mammedov , Pierrick Bouvier , "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ani Sinha , Richard Henderson , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/7] system: Replace arch_type global by qemu_arch_available() helper Date: Fri, 7 Mar 2025 23:39:43 +0100 Message-ID: <20250307223949.54040-2-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307223949.54040-1-philmd@linaro.org> References: <20250307223949.54040-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.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 22:39:44 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: 871278 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f8d:b0:38f:210b:807b with SMTP id hj13csp2598wrb; Fri, 7 Mar 2025 14:40:17 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVubP94ewVh+NuLvfCH9GX8wVsPjWQX0YDklp9Pxe+fcjv2vg8eSx+ja1KePZnUU1Esr4rvIg==@linaro.org X-Google-Smtp-Source: AGHT+IH/c9ksJaNoAIeCcogvv8ftSI3WiHbDUVwWYh6MCnnU/Z7J9VNr7Fx6DTc5JRoFaVb2h88U X-Received: by 2002:a05:622a:302:b0:474:e66e:3951 with SMTP id d75a77b69052e-476623b8358mr13479871cf.6.1741387216863; Fri, 07 Mar 2025 14:40:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741387216; cv=none; d=google.com; s=arc-20240605; b=AMP1MU8CP/l8PF7rCDolC1QpJGliIISgyQ5KmGKVnF/QGxA9ciTJTTX9lw9oJw2dZ/ Na72ztdcBOWUPzvgp2E9Xh4gYEHD1XBdz9UU911H4KoiMtdjAK6Lrp+8yYzp4wWHbQS5 CpMvNxWFXJvFxKAZTRXugOl0zS/wEvU9MLhQU+wz1zYoL+lrZaisbXGkqp9/2Vv5PCUk oq7JcruolU9fJuKp1aXX5yX/uKxCTmfOFfbwXk4b1k8De8Jdw3Jx73BBFJTptcVHtDQI mQ8BgK5flxct5QrzpXdOxpC/Se70L4u0mmuXPXgkY+ZXJhTnutJPfDWj8gyyNkfIT4LK kuYA== 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=koJwEkpLST/7gWyCJsL/yXVo3vaaAtJxi2Nw9A7NzsE=; fh=5sZHRtAv1g4cZ6ovoEOjlIwCffzjyNuuBfnrj4TqsM4=; b=b7th2245p/5SZcoOUNyNUVo2GiJPelCHXcQD7ieHj/7evDA4JPPh4zi+PbAu4HRqzk cErGEnVbzmUCK+qNFYYxmuWahDQdjrrF2EZ/0Y8w0uw5f1MCwMaVfMfxXGpAUy5/SVvl 49gfgsiThPDmzTSJyVZxHncNmfPQKzjhsDFkZEQsTC6f8clfmsWtr1ka1m0nC9qxn2xH q4EW9CsVZCDS1bSbuFF207VjiKkRBWep7UMVV8MX9ooyLKv4y1zC4fFCN6NHTd2dyuOD Ml9mZC8QFtVroJ0a5rznyH0IkMtLY1MP+I6LgXpFAUFdZhFf15IWdVUTa3gsRryeb5Ie bqyQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DDKsMw29; 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-4751db1de10si43737041cf.413.2025.03.07.14.40.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 14:40:16 -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=DDKsMw29; 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 1tqgMR-0006Az-Tt; Fri, 07 Mar 2025 17:40:07 -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 1tqgMP-00066z-08 for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:05 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqgMN-0003Nk-4n for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:04 -0500 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43bbd711eedso18413215e9.3 for ; Fri, 07 Mar 2025 14:40:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741387201; x=1741992001; 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=koJwEkpLST/7gWyCJsL/yXVo3vaaAtJxi2Nw9A7NzsE=; b=DDKsMw29k+bny3kzKqubFlxd+ZrH++YyXmd84Q7l3+ctBdMx/yrmX+s+sQE1BVxmpU OkbkXXFx/9B7ln1JVPbAS+qKxLGOG8pYzP1b5Cmc2lQTAVnQUEQQ/eMYdGWzWGmE2P2K A4xz+rxxm9+CatJdDnBgFuFgju0TET4drTmc3qIq0I+TAIbGRVp7rH/ZxBC5fB08EcPW w7EVfpEweUJwRlDPpePb48HF6pqbmlIlxgRjybNow4bLBGZ8P9BRIx98GkBOhoBanjLI qXAUcHeCtX0DCuCWzrFA20bkdJA8pTthVR5Ju0W0SNUaazXtcD3RyksAk3wN/n7rCGK+ M5uQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741387201; x=1741992001; 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=koJwEkpLST/7gWyCJsL/yXVo3vaaAtJxi2Nw9A7NzsE=; b=AqKY6p9iHkRLyXAJmYP9KDs+fZGY8/kI/NmHzdt2zLOOq/4w/32M3VWi1rxLTljri4 4JkkmqIj1EB03akC18Nwzpp6QF60H/Qnjc0JgG6NmIErABCX1RoDIFr6mYPPLcGoVGS8 qDJITs7TuUNNFBxZRWDHLJrSWsd6+wXA48Fha8Iuo/ZGsEePmQ55fK54z6w4GLVfotAY myFaMeKIhCChbkSUFIZvHVcSnoOk7WCnufMehxjbrnwZgdJNM+i3clNYKTVgOAlbzEgf MQJLC/LcOcndpPwlBtcR4u12Ia7zQhK625tFAR4t2lkKorbVX3Cosxbc8mJKa4mqZ2BD dhJw== X-Gm-Message-State: AOJu0YxFTJAUTrSR3XP2juI4s5f1ATBYMoYOJEEUiZX0hlyxOomHX6Xi BXRagI8Vc4/COr6xPbXyPR5crnLCoeB2Qfer7/TILMNqkAvQv1rGJQ/T9/0L5j4ekYbgrDuMnzP O8JY= X-Gm-Gg: ASbGncvcovMCpNcXmG8pCfdE+Pkh5ubNJvM6xl1cjHJfE07p/o0xwfz8pfaf5ppS8Mq 6s1zlfzWmWWlX3pJFS+kKtLMF49mtIqhRg57h1+xQDPYaHlgbOL5LkZdsOvWsFo2k3z+HGKqqxG 41HzzOCxFaISVJpMbDpLXzkiKVs/0q9kspvz9SUoqgfs0N/U9jsmN/13XmsB1Xb/rDzO74HZnGk kv5gXHOePxovweL+tv7bcTT6YGzzNraW7CR0rGuigpWzdxqmnqkL8DhS/1bLq2zCK23SQ0ZlPNO u3RNoPZCe3LcYwK6OvJ/qhj501MmoOa6jX/KrftgcoJSAlm3EiXOYbLUicd2l0IZCA6k62C/N25 pIIIxinYu+2ybbbxz+Es= X-Received: by 2002:a05:600c:1c9d:b0:439:643a:c8d5 with SMTP id 5b1f17b1804b1-43c549dcc0amr41814965e9.0.1741387200874; Fri, 07 Mar 2025 14:40: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 5b1f17b1804b1-43bdd8da473sm64096865e9.18.2025.03.07.14.39.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 14:40: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?= , Marcel Apfelbaum , Igor Mammedov , Pierrick Bouvier , "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ani Sinha , Richard Henderson , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/7] hw/acpi: Introduce acpi_builtin() helper Date: Fri, 7 Mar 2025 23:39:44 +0100 Message-ID: <20250307223949.54040-3-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307223949.54040-1-philmd@linaro.org> References: <20250307223949.54040-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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 22:39:45 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: 871280 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f8d:b0:38f:210b:807b with SMTP id hj13csp2741wrb; Fri, 7 Mar 2025 14:40:48 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXwFkjC7HgoyU51JNg8Ccawuxt/G+1qS+cSZuBGyJ+uuBIlm0aRetxQbZRhmx3yS7GpKAR3HA==@linaro.org X-Google-Smtp-Source: AGHT+IEl/DDibDnTcrx7nFQKWCnnODqIDY2GsyQGdOIvkDvghsmBpk4BlIyLmeXM2jbohPfX8/gZ X-Received: by 2002:a05:620a:2813:b0:7c0:86c7:1a46 with SMTP id af79cd13be357-7c4e1684873mr850126085a.23.1741387248177; Fri, 07 Mar 2025 14:40:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741387248; cv=none; d=google.com; s=arc-20240605; b=DbuPXhk3Eh/Xr+xt6ZvugxTIQvxlf9hZ5Dlw5nksgC5/K0xjH9AEXXhG4PqyFUdAVI l7E90QSOYjetLMNsd77ov2rsyxcsZG/xxfngHIpaRe2YhtgnW3aWvCrtNXQwD5oU2/Pt FBDvdr52NvUNZmimWDmo7CSdy092MlcZtUNzyoylGgSL7Xjlg/fysGTExOVigbQxZd5o /G6ooKjIBPSskzDNy/2Zb9uG8lg3JpcWg7huKh6N7ZiV0CsVCDqeHNyE23Ia+2DhIw6N K72TlDYAdteUlpSAnBxe7jAHsrM/mqn3o54lIai1J1yPAiWJQo5TLaj5hy5TZAxVi33l 1YWg== 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=VODePOvWuMJyhRGr2deCbWysjZeVNWE2sWKn1Ustt/s=; fh=5sZHRtAv1g4cZ6ovoEOjlIwCffzjyNuuBfnrj4TqsM4=; b=N3y9Su+FQOpIRjQo8gekv1bhmjVq11Mp+t63xQFMVMjs0iDC5OUsx/OOSd2WU+JW+6 JNeAa/9Q0qfKAb9/FnPMVUY/oIv/cAM+/SGuz58iYjbg4NR5BT4/kWf4ZO2BuQyGpEgi cUeC62cZOyTB9SWYetj7b1zsMvaEYhc4hHUurNeAEmeBCDsYE8CEUb64N4eTxi8Vv7Wu h4Apu71sg6lrM6+Gi4oTbngmmlKUEg6qjT16EWu/3giH4n85hvuUtWLPm8Q6ipUO+fju 3yRL5/k76wr+4CvMvkJd+cg/24ggx8io/FPoqjchvjWnRV5RP+xf2MXj9oJovLmXznaW 2DPQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Lzsh4w94; 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-7c3e5547785si431235885a.579.2025.03.07.14.40.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 14:40:48 -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=Lzsh4w94; 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 1tqgMV-0006Ei-T0; Fri, 07 Mar 2025 17:40:11 -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 1tqgMT-0006Dt-DZ for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:09 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqgMR-0003aF-PL for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:09 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43bcf9612f4so19962185e9.3 for ; Fri, 07 Mar 2025 14:40:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741387206; x=1741992006; 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=VODePOvWuMJyhRGr2deCbWysjZeVNWE2sWKn1Ustt/s=; b=Lzsh4w94hF1W6hZV/qyS6g/OOMLJgRxQ1CcZwfjFvkR9gsDc0LpxDxRU44Nw0pLB71 YCzbMXunLMkrxipNxLuLi87wQKLGSSzYQOr36tbopug3o8h+ux6+omENInjAScgy1nNL 8RZf3GIBq+QR+bEeKC95+LXf8Y/S0wNDXFYQRFuS4CUX4knt+aXDU/GgL7dlFrTP0SMZ tnOHvXe04nETfNA//ALMlY7wyXu1wYIva2i0ruukQSruYV3CViWvfR1j7TBlxGrPg9pC 44fomUExuK1ZqubgnSXshKcaGWqYSnD9sqEXfTn6pc0Lu15HdRxuq6oSkYDZmL7zd3Ob cTwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741387206; x=1741992006; 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=VODePOvWuMJyhRGr2deCbWysjZeVNWE2sWKn1Ustt/s=; b=lEw8tHXPsr9BNbL+dZdwqWazEIV/2OwM17ZwQoqDb98GojEoVx4tzRScJDijkzSbyt n4C40Zlwb7nmPpoIb0gRJEg1NVyHi23mDrPzMulmf/8zK/zGTjySzWIJpB7/3QMT7cRP t9HFvdfAQmkSLYbdEUv7V/wLqJ3bD1OfcaONLqCC1+45f76+SAWu7KmAI+6wJwG8T85g QMmwjuyYFjPnTxB08w6Fu50FpbVTEbIoCq2Oe+kKjajRMLU4qoVRRj+rnSRgn3BPu2VH 5T4+Z2wlVDsHlGLOLtOPWg/EGJsKTKUhNE+OFSK3bLAKH7PfQLvkaPVBD4VABNeuIMBW O2Cw== X-Gm-Message-State: AOJu0YwF4wbT7KxRq6FfMgub/oYaLPswsTy8Bxp63YjTqunLeQVfNl6D wd6CRmTDxv2TXk7HcGSCLfx8YKEU+oixHP/4/QPyQ2g9oryMENX98t6TgqiPj4Z4y59UmBlP9UK wmPU= X-Gm-Gg: ASbGncvCORToVTWWlI2B3uBlHalu7JqmLcPY/1mNtwssef6q3YkDQH4L0Qds9KlySr0 Uxtrlq4ZLyuUvOmnA+g6GtHOeP0eN8BW1yA+FMzEaQDqIC3L1+nW+9kvzhR1Ng8B1LBDmCo1Pyo 5zJw5Tgu/vHwdKkd/lDa72HiVfcTMCV0kGMSbRa+ytY51XAVd4URKR9RCQv2SdVWar0SCvbaCZC Y0zkbGvAyE+noTA4tgSAHEznzn8VnbrxZ/9uV9vDznCGj44751QdARS/Oeihfc9LDASRh8gFUkw DgfpqmNpRdLeHTeDKbLffDGfPlhZo9CZQDkHr81eKoj54H7rUnpUk00EiR4nORtNX8zHAsZ/fKc BBITzDtynjAlHrQmHKt4= X-Received: by 2002:a05:600c:190f:b0:439:a1f2:50a3 with SMTP id 5b1f17b1804b1-43ce246ffabmr14923365e9.4.1741387205744; Fri, 07 Mar 2025 14:40: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-43bcc186de4sm63546565e9.1.2025.03.07.14.40.04 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 14:40: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?= , Marcel Apfelbaum , Igor Mammedov , Pierrick Bouvier , "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ani Sinha , Richard Henderson , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/7] hw/i386/fw_cfg: Check ACPI availability with acpi_builtin() Date: Fri, 7 Mar 2025 23:39:45 +0100 Message-ID: <20250307223949.54040-4-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307223949.54040-1-philmd@linaro.org> References: <20250307223949.54040-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 22:39:46 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: 871279 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f8d:b0:38f:210b:807b with SMTP id hj13csp2691wrb; Fri, 7 Mar 2025 14:40:37 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV1x6LZDS5A1/cTAWwLjj4SZnNgZL0/JPyowSJQoodv5KxS5XBmcrTVGfPpTC7FV3NXHdyt0Q==@linaro.org X-Google-Smtp-Source: AGHT+IEqXx7TyMZgrBfLbBcXVAfXfKERhqlEp69mgAUqBNDIubBtwwODZaqeqypPaVjyMCAqyNk8 X-Received: by 2002:ac8:57c9:0:b0:474:fcce:c97 with SMTP id d75a77b69052e-47618aefa16mr62579171cf.51.1741387237470; Fri, 07 Mar 2025 14:40:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741387237; cv=none; d=google.com; s=arc-20240605; b=I5CoxccH03YR735F1E4VJ9TTGYUSwMoZSi/WITqpe1QX6m3OVBLsi1fDR3W4Skioeu qhWnuadmbT1E3nzfHkjCWmHoC0egDu6/nc0vdUezIdWqdeS/pQGwBv9Ep5BAQ5dIFo14 DFHeCZzOfzZm8nECtGaPXwFJhJBFHA2xmlAPoZmcAjoo1l4YN4veDji5e4u6KpSFdLnv xvajGQiv199kacb8KIxTYJrzQ7+JcE5cPY4ikcRyalzztFPbR2nbxK2OWR85jJ3+FSGP BPv+L8xYeU4eti35w6sMxMPFCBcDNdlRMh4ukJ9GO6HcyprAt1auxIo7IO2+/9gv115r rvfA== 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=IuwCf4WRGv3h0tr40swdZHn3OJodO5dUQXcRGaznNRk=; fh=5sZHRtAv1g4cZ6ovoEOjlIwCffzjyNuuBfnrj4TqsM4=; b=QOFGSHJaCXhixLNo58EC+NHkjHwug2HspQxpqztxI/V29msb8eLDjHdEfVDVCvGICX ewHG0lU9aPcyYoE7+KXLYga3BMYauhLTKJgVk32XLIV9EMeMFDIVDq0yJ/Kgeu+FuWGy RWS8RjeVBuIf2nKSD4FDXq0on9cX3+1KHVvDkXtfb8iK0qtTksm5bJOrVjJHguZ88E73 yBGVK+IcYa3eS1rCqBWI9KUeBlRcJzLExJk+onix5PMB78jbx0B3Va4lZwuPooEY5sl6 e8PXtzIbjLci9gmgMJpxXvy5PaRFb4hVI9WcbL1DGg21Htha9tQvpf6HnEdVHqYoZAmT VvIg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="k3u/8O+L"; 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-4751db444fcsi44620661cf.513.2025.03.07.14.40.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 14:40:37 -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="k3u/8O+L"; 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 1tqgMp-0006NV-Oh; Fri, 07 Mar 2025 17:40:31 -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 1tqgMZ-0006FA-MG for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:17 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqgMX-0003b6-OG for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:15 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43bbc8b7c65so27161515e9.0 for ; Fri, 07 Mar 2025 14:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741387211; x=1741992011; 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=IuwCf4WRGv3h0tr40swdZHn3OJodO5dUQXcRGaznNRk=; b=k3u/8O+LS0s39UwJ54KwjmBxNee5vyeut89tFmivEFbPCN2SBTHVDzm8cXSwkOQDRz 8CvB9lWIhTy2PoHhY3bUHhw4XWqTlU9/e6MD51llTq3ltgp2lVE67bkbFQPevHmCf4FB BzOiTsXoo2Eg6cSgERHM4g/phDtpK0ijYFuEl4Y0qdsEgWpxMsYW+dDnjRP4wMy1vjLs /dKeFJ+h3ol1LUUH+ZDlf8K6p/M1EXIvOxWo74h6Cf3qRJkz6rE5Y4yfaQHUd2Kdx3XD fTe8WcQW7pmwKXItCqmGDmbj9mUZXVnJtD9tWUqHpfgUrc5oR0DVrJaDLJ32qP3lmHSI KfVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741387211; x=1741992011; 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=IuwCf4WRGv3h0tr40swdZHn3OJodO5dUQXcRGaznNRk=; b=nL5XqMhcYekByo0LepGzTyBA59R/05CWIGlUgmOrio2exHBTdcFEqkNTK09K6RNJ0W 9KhJ19Cl9o+FPetu7K/mskVaCrP85zmhnbSnDlHcCz6pPEZVxgOgO9lPSmIXxht+rrBN ej9Cba7KhJil3XOUiyFlWk4fgqGfeGaAW86qPxMzmegh6H1JJup6KvwCxcLIHOiExtRT NK3vfU55o3wgMZyqsrFtA4ZaCSTEWUojN7Ln0X4BzDbJ5KcVb91lmDdRR1IjJEbvsPs0 pg5C5guF/e5sf2LCuGREAXQG1jPaursWVFh3JTsK14PePR7NHNBqTP178fCL4YOD/0Hn Cc9g== X-Gm-Message-State: AOJu0YxuFul/T6+jEL6V3i5X5fTW8t4qJmRgBUZteKjlN1h1rd1k7wUb d0rIMvrwKEKXrn41voLxbK6Iz4WqgtmbrQsUz+tAOdfZvtfV0uW5lV0X+ju9z4pgDRJSm67SAnU g1Sk= X-Gm-Gg: ASbGncs5gX4Ecrp4PWN8g1A7stwywMjvwHIZ+xfykDVwJktjM2UpZLMLuL2A0DvgGzn Dm3/UcNLOTrCeCoq4yosgvETx2/Oq3I+SC46oOFzr9wva48FXz2MKaF0K5g6pnmK/dp1lUSa02X Pgdm+Ny0Y3BrUtm9u5GuIDnnZfOd8v/SnAkVvL49pBdYwr0lpD/9Fu5PIGjL491qlTFEeOEsLt/ aA281Ez4jUOAtzuMJ71p7FL2bgsH+5aRC2FZnZbcD5j+3J7OoRGfKr9WUmaXB4Nb/Rq6pcYmXqi sz0owq9ac7toSmo/QViMubfgVkIlHpqYKyWqrBR5eHQpO06ZIVLqV0yoEfbRpv/9RlRgXgJUD5x 3vP7PdPV6Ab5w8lc6k0A= X-Received: by 2002:a05:600c:46d3:b0:439:9424:1b70 with SMTP id 5b1f17b1804b1-43c602223f0mr53786585e9.30.1741387210570; Fri, 07 Mar 2025 14:40: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 5b1f17b1804b1-43ce9f2d081sm303985e9.21.2025.03.07.14.40.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 14:40:10 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Marcel Apfelbaum , Igor Mammedov , Pierrick Bouvier , "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ani Sinha , Richard Henderson , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/7] hw/virtio/virtio-mem: Remove CONFIG_DEVICES include Date: Fri, 7 Mar 2025 23:39:46 +0100 Message-ID: <20250307223949.54040-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307223949.54040-1-philmd@linaro.org> References: <20250307223949.54040-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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 22:39:47 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: 871281 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f8d:b0:38f:210b:807b with SMTP id hj13csp2745wrb; Fri, 7 Mar 2025 14:40:51 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVgyV8lG+WbctWGj0kzjz782fZKshGV/pD0ozgryohvW7DZi9B8C+Aqti5hE2rhBdR0jxpvNg==@linaro.org X-Google-Smtp-Source: AGHT+IG051dpbn92jG2AALpfMgKXaJRgEHiSEt3HXwdKmjqU4PszZTCCZNqZY6XZ61g8TbODzBmC X-Received: by 2002:a05:620a:63c5:b0:7c5:3b3b:c9da with SMTP id af79cd13be357-7c53b3bcbc3mr343715585a.40.1741387251064; Fri, 07 Mar 2025 14:40:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741387251; cv=none; d=google.com; s=arc-20240605; b=F1KaKP78Lqh7Zi8LdP1gIsF3FGsuwW4v9m++cZhd4ipny97PYJPYPXoc7zQyfYyEGT v8KcvMki6fPcLWFBzu1xx5RYIbZY44l3Ptr2BYpqdYIbChrB9PPSOnrDOy/ghl6xQjyH qjpnuGRZJVJRCPV2HTetZhQwQ/xE5EPccb6hKGUsH49B//vjSel1UacuAttVxaWUhrsb PygQjo7bJPrkz0Drn4ansbHNTxNMED3K23RIxW1bU0oldnx1Ix8JnXXH5ggNKDDJfMVV NLUDaKdUjZB98O0MEEbL/ssP7JvUW4OUAnGxsWNFBXA1rsCeRjC+4tbHKJvyTyw7dKeX lv2g== 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=ffnzgiNvC3uFpe+lcYwlOkxah8KhJcrF9JntmJhQznA=; fh=5sZHRtAv1g4cZ6ovoEOjlIwCffzjyNuuBfnrj4TqsM4=; b=k/CCvnV/rargfeyP33YKehDFfScMJIv8t6u5j05IAQy/vh+vvmAEdxootgjdfkhigU smBxk+lvKPR+f2Nm03mA/GY4510JEs/lL8Jb6F32r793/iSxL+ZhCJQIsOWODZuS5M05 OFyLD63GaAtLKIj5X58dxMMie8nJljd/igcvAJOnrxC5tEI2vDWIlW58lB/FxUNBENjY XEYs6xYOJobGJpzez4EZJpp95tzuzmcLQsYph3EO+QoXvWsZKJfHKtjdHP4QgbXyHLYK +NW0H00AzXvxtrEgDCJSDFsW3tRqLf+2x/tm7mNfA+cIasklF/q252hSZGzne8+D6DrZ 97Qg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gAKg4P0C; 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-7c3e536adfasi416875885a.165.2025.03.07.14.40.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 14:40:51 -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=gAKg4P0C; 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 1tqgMp-0006QV-R1; Fri, 07 Mar 2025 17:40:31 -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 1tqgMd-0006HJ-Tx for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:21 -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 1tqgMc-0003bS-41 for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:19 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3912baafc58so1585896f8f.1 for ; Fri, 07 Mar 2025 14:40:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741387216; x=1741992016; 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=ffnzgiNvC3uFpe+lcYwlOkxah8KhJcrF9JntmJhQznA=; b=gAKg4P0CKNf5qcLU4wGiWdZTGpffmk9cWwDWMNdRiBdeTQgi4jBVBKw80UkGcPgbv5 8b2tQSyUWSIgGvn8Sz7AGmd56eLnIgfLGUa/ts9CYJf3Bc13cUjE0uhpI4BoRpLdjrbc wfy/Hvg3KFJopGn8IHTg3P/439yJsuY+SfJSSoQElwv0QQY5sixpX4UX91kl1rnRPH4S ezhpwwDyLIBQ1dEZE1Jp/h6AmRFatnK10gTh40d0TYtggxSpD8ZqofIeDN7BTpKdf3FQ UNexEVwXOBI0tLYsbMQCGp1dEcW4JBhh7DPjrKXtOyjX9wprddRSWC2kLKVZqL/XLymk os1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741387216; x=1741992016; 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=ffnzgiNvC3uFpe+lcYwlOkxah8KhJcrF9JntmJhQznA=; b=UYk3FdKoRUJfr7v9EwdwlaoHvMnFY0u/lOPqa0L3UiVM84SHp8KplrkbvRxBkFnhQh rbqTjy3K1y/wNSrhYIRFWf6wylpesix8l9IykM+V40Ab7VyrD/NH4ocG30T6qaNXV76R uyk03PBIv6YLT4rM3JK85PLHBN//R/X2hHGOaWIFKuTUBHkc312G7TY+0sat5z9KBonF VOnc+dXZw8nZlQ/ghAGueR60hs4n5eFnJtGGMY8SlrLuLRWnpaCqxJbGSUsHKuBVTHDc co6yiQgviZbgP1Nl6GYNV7ckhiSq8eg1g9g3/V7bSgYycJfgc72HhEpnqQQve7Bp7pSu RwjA== X-Gm-Message-State: AOJu0YwwQRnuIrLyNpD8CaOeKhZ/vK/y/v3gS9RTX+YsjaWh1uDUUKt6 gXDlq619Ec4iIOLLCZog1Kaq48440zP9L73FpWacESAEm9z0lyeUbH2qK+6M2P9K3uOp4Cn9Gny cNB0= X-Gm-Gg: ASbGnctQdXYTsbiFpSnrmNsqvv71lKo/suRcsnhL2H3Mou3EyRdnSfusUDYjioT69F1 7j1bQvZDGU9OBN3KYKz/I3eM6YfXaBzRpV8V7BL2Iak1fqh7ckMG/4atj018n7Nk+AKTap0f2VO OtVs+psrIpT1E8utZO4MiS8YA4r3mLRZU5qE4OONj8jCIRgO2tGx13W+07MlkxmNLymxd57LK2U MM3F0Z9cNtB22Hs5cLXRuvgAE9M7xOCh7P0FyuBUWhDa+5fA3XGrF21er+Wjb+piaAykUGUu05K JdSc+XI7VMWMOgh8fS1mK4rRaKvsh3X12ZqSh21Pe5XSVu6zedqaZ8ET/cTrhWYH/CC+sg4swRk zeAHx7FpjdqpNiaWLh9A= X-Received: by 2002:a5d:6c65:0:b0:390:e1d2:1dff with SMTP id ffacd0b85a97d-39132dcf7f4mr3366037f8f.52.1741387216052; Fri, 07 Mar 2025 14:40:16 -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-43bdd8de4ffsm65306125e9.24.2025.03.07.14.40.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 14:40: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?= , Marcel Apfelbaum , Igor Mammedov , Pierrick Bouvier , "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ani Sinha , Richard Henderson , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/7] hw/virtio/virtio-mem: Convert VIRTIO_MEM_USABLE_EXTENT to runtime Date: Fri, 7 Mar 2025 23:39:47 +0100 Message-ID: <20250307223949.54040-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307223949.54040-1-philmd@linaro.org> References: <20250307223949.54040-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 Use qemu_arch_available() to check at runtime if a target architecture is built in. Consider the maximum extent size of any architecture built in. Signed-off-by: Philippe Mathieu-Daudé --- hw/virtio/virtio-mem.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c index 5f57eccbb66..6ff9dab0f66 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,24 @@ 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) +{ + uint64_t size = 0; + + assert(qemu_arch_available(QEMU_ARCH_ARM | QEMU_ARCH_I386 | QEMU_ARCH_S390X)); + /* + * FIXME: We should use the maximum of instantiated vCPUs ARCH, but + * for now it is easier to take the maximum of any ARCH built in. + */ + if (qemu_arch_available(QEMU_ARCH_I386 | QEMU_ARCH_S390X)) { + size = MAX(size, 2 * 128 * MiB); + } + if (qemu_arch_available(QEMU_ARCH_ARM)) { + size = MAX(size, 2 * 512 * MiB); + } + + return size; +} static bool virtio_mem_is_busy(void) { @@ -721,7 +733,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 22:39:48 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: 871284 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f8d:b0:38f:210b:807b with SMTP id hj13csp2958wrb; Fri, 7 Mar 2025 14:41:35 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVYHsmydDYXZmZ0BVRakj4ssOV8AOMlnHILx3kfvT69Co+s57+EopNr+JSCEwhrX3BjG+cjVQ==@linaro.org X-Google-Smtp-Source: AGHT+IFFDoT2+RgRUeF1kh+EAoPRIOh3GleOU0jhCCV9OXM8cVo3F5NSt64P8q3EL8UG2WnZMRNz X-Received: by 2002:a05:6214:da9:b0:6e8:f1c4:f9e8 with SMTP id 6a1803df08f44-6e900603b6dmr71456176d6.3.1741387295408; Fri, 07 Mar 2025 14:41:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741387295; cv=none; d=google.com; s=arc-20240605; b=Nk0z+2gzRgsmO3h8Yn1Qm72+40L6wMDliuQc8rSguokocyF7z5cjAO8Ym6Xi9TO3Bu 5On2amPMe9Lc98mhT83KrNFpve8Uc9NHjW7Vs4Ywh5itPQkGYtdUng9L8rjvFULDy+L4 dn17gnY4e9k+9awfLi5fRwpAj7NbRx0G7B5b7jeTykuaocjtUjCWMDraSCBUh2It7znN p8l2JX2JLN3mci5c6qNz+Ga9JLR1FaL2kcpig8jU3oDclMF/laqAq1Qg/VOpjx6EOAX7 GE8jOiKkAfg9oyiopqwePFcCcGTSsU+F6M7vgpof3DSPp2qcnoa7nuiB1gfuGiAJdOMn pdtw== 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=QySqG3zSy3Pvfq1KfaUgxmaXz+8tcYoh2JzWhFmGcNk=; fh=5sZHRtAv1g4cZ6ovoEOjlIwCffzjyNuuBfnrj4TqsM4=; b=gKfBC7SvrGkFL6oGHasTVgPBH7z87oe8Fmb6nvWNDQRElExB3EviExS79iXCzRypr3 s9DRDwFN4eHjv7/2UrxmUjrD5MpVZmod7+A8X/lGA6cKdr0uErMIJ2vwXE/XyfUpoJdD bDwkix9fIqQReo6d5qFJPpVdwY8kPERZB4bc0ZqfGB+K+VQUJBvv8Gl79Z+WT496EpqU cShbrRcizmmbGPGW/tIWdyI6Tg4La1g8w34RTtC1fIl0N/UkLzy+GU8xgswTtqFXjKC8 fMyHTCKDmBaOl3uce/b/qvL3var8CeeFUCW4ulAb+8AV1uEdtFLDdwviWWYPVJ3A42bu UERQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gz3ZicF5; 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-6e8f7091699si43936356d6.115.2025.03.07.14.41.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 14:41:35 -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=gz3ZicF5; 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 1tqgMu-0006hN-R7; Fri, 07 Mar 2025 17:40: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 1tqgMj-0006N9-UB for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:28 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqgMh-0003bm-3M for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:25 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43ce71582e9so765215e9.1 for ; Fri, 07 Mar 2025 14:40:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741387221; x=1741992021; 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=QySqG3zSy3Pvfq1KfaUgxmaXz+8tcYoh2JzWhFmGcNk=; b=gz3ZicF5B4xr8miq6EROllkKUaLLgIhOHB4VFnljfNzQXdr0qGykTA35pXAsuCVIAz q2BvVljt3Z13fvSIie2XDOQPvp54yUZSOKTY0G479k8fYAmxpmuAZfO80sSch2qIvLV7 3SDsTV2ROIYkrWSZEALL60W4XSeZqYYtoHKrxlJbxHxLT+M7or8SVd0/gTsVtdPQWlRv yNURyDzrmulrOIU/p3ICtPGUPpOIqsB1v0vPC+JU9IdatdPXWWHrtESqnu+KfXGe+KHc USIvniABoefgWrfzKaTkpvj/827WyR07CGG1XbWJBjRQ8APi1s3gBOg0T351fFGi9Ytf E44A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741387221; x=1741992021; 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=QySqG3zSy3Pvfq1KfaUgxmaXz+8tcYoh2JzWhFmGcNk=; b=JBZ1qNro2KRioDiZazcQ8TB5eVvAKz92rSDkElSicynhkms6JtxOgPQmtx8jtL3z9Q ada4EvY++qsRpPZZpUuf6s0vmJvyUoCIFPLnJMgrR5nQRlBGfQ6BfCd0ymUvpSU5XDWB SFXEYxC0wPdn/T/CN2zz9yBpngoPltk3sZE/KjzQDQeh41ArRdyQur95SbpYsoiG2eor vRZhrb/eO9Wuxfh7F7L9i6WQVDea79Fs9oT1v0sD2IagylErzygHFaEdKSiXc08zfL08 14c+wuRDohsXVG0NMOOwUmEnMxOchdIZ87zL2xo6DMshfFMNt2P85XVDGPiAZ6FzbF7J PEsw== X-Gm-Message-State: AOJu0Yz8m0zqiaH2br/sfPkxvKm9hl5XVWAzLDg91+arvPWM2j40sxPy VLU+hvk6pquSI0qqe7hMrps+XVkTMmLldfSj/bw8bQKWoF7M0mNSknGpEyjUAZLIV3CoQRQXukk exoA= X-Gm-Gg: ASbGncv86U8sDRKFscoSZQmvvxxKNPd+/YpcHEUKJA4hGR29GTEuxA2p6sfms9d97N1 PN5KDKQd53XTcsveAS9wqusySqt7+e+1GFVKLFQPY27vU2+5zja0MqUVm15shkinYEuAdNaf9VI VVchwwfig/C6tIFwo1L8RK7Ahiiom3OGgmiW6PNOr3y+DF9F7sHbeUoP0M4ZOvs7qTldr/9Bz3s LOfJlmvgfM1pZivSvLJkTpNXBXAq4WB+1q+hqZOD3oWP5aFFVuCHsryUFWHf/Ew5pAz8XSvHY5k tvTSl+keUhU9Xx4nTEn/CE/BiUU3sw02ZMgMWMk3syG3Dhf35FtmILRF/oNvVlxEEGxwaNNpOZT uMVuaADSzjKxZWxT0b74= X-Received: by 2002:a05:600c:5107:b0:43b:cb05:f932 with SMTP id 5b1f17b1804b1-43c5cf3cca8mr30089325e9.25.1741387220883; Fri, 07 Mar 2025 14:40: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 5b1f17b1804b1-43bdd8dad73sm66358775e9.19.2025.03.07.14.40.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 14:40:20 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Marcel Apfelbaum , Igor Mammedov , Pierrick Bouvier , "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ani Sinha , Richard Henderson , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/7] hw/virtio/virtio-mem: Convert VIRTIO_MEM_HAS_LEGACY_GUESTS to runtime Date: Fri, 7 Mar 2025 23:39:48 +0100 Message-ID: <20250307223949.54040-7-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307223949.54040-1-philmd@linaro.org> References: <20250307223949.54040-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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 6ff9dab0f66..5288fe597b3 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. @@ -1009,28 +1008,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) { @@ -1723,16 +1722,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) { @@ -1885,6 +1885,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 22:39:49 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: 871283 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f8d:b0:38f:210b:807b with SMTP id hj13csp2883wrb; Fri, 7 Mar 2025 14:41:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUdalkkZxFYXpOUNTTFFYoRKOXk9DoJcK56xyS2YVf1YaBLnijUXxhCvE67zJ1gIF5VpOQMiA==@linaro.org X-Google-Smtp-Source: AGHT+IFoUX/22NariCgsGsp0o6YbVo7/AIYHeUv2lzD2kBAv7fBLrLJl/ig2nL825VeuRP0kmJo1 X-Received: by 2002:a05:622a:1983:b0:474:f38d:58d0 with SMTP id d75a77b69052e-47610945c75mr65134171cf.3.1741387281999; Fri, 07 Mar 2025 14:41:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741387281; cv=none; d=google.com; s=arc-20240605; b=NLbJ0LelVkzy/LwMw9ncYFWPy0r1tMpdmXwuQKSnT9fPfNxzKdhSmyVRqSLmrMkf9c PHK8XrD5AR8aK34ON1zFZecBc9paZSl902lpdStIGhUvu4kNyy8q4ORCqUED/c+/VcBq aVb8N7YDNwW6QPV/Dl7BdUAE4mrnJafu2F7dxgSzv8Nn0CbiwnGKSnyv+Ns6isKl3Tjv vFUaYePl03xC7QbDRrzSeQmqcFiIvwUAw5+01olvftHGwVHht+7fNVgr6JFIJs5JObK5 kSbEJELP/AQlwMwDtoHzzhhk2031zsADhvRuFgd5YM6dcEU1SktCF66YGB7iLDNW/daE CX+w== 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=mnovoaUMqprzKKHYFuoZMJZ/2zGWdVOJkellgnL8PG0=; fh=5sZHRtAv1g4cZ6ovoEOjlIwCffzjyNuuBfnrj4TqsM4=; b=Q7nfEoG4C22wmUQIVXyl7gTo277UoNs3drV/QTixIQDdENvmYqToO30/ZgrGjUqh8L H1Hy8vkUgi24LDRNVQGGNsINE1okaBQGaoHxsuhHEr72Sndh3D58Mn1Aprqz87LGM6pA MTktLn+FlD+VSS392uU70de96R9PYnadedNUG/My8uBlZRqngrknzO1KF8vMCwnE/EPD iDhAEIKW7riB8PPXBuD8ijksEv2gltIf6HVCw/t6Ahc8Gn5Z5fp6F4RkFcMD2ds0al4f c9zTq5+QZemUXW4MyUuTwucO+W404G2FqjTU9/C9Z6NWVAyAhPJkEhBqBbKyR5Z+f2i/ xi8g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=czMQKFBY; 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-4751d9c18a8si42834261cf.180.2025.03.07.14.41.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Mar 2025 14:41:21 -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=czMQKFBY; 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 1tqgMs-0006Xo-8H; Fri, 07 Mar 2025 17:40:34 -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 1tqgMn-0006NU-BE for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:29 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tqgMl-0003c5-KH for qemu-devel@nongnu.org; Fri, 07 Mar 2025 17:40:29 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3912c09bea5so1707614f8f.1 for ; Fri, 07 Mar 2025 14:40:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741387225; x=1741992025; 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=mnovoaUMqprzKKHYFuoZMJZ/2zGWdVOJkellgnL8PG0=; b=czMQKFBYNwLtRP7DsDDarkvweUNXkkfgPiPyqMuqG6BtxfiOHcfehR2bHDv9iYQl+7 3Hjdh8XagrlUPVpDWV4YAPdq8O8WTIq911kTDKgEAAqdWipilNHboQ+cSgqzaMML9AMX 02vWH4FXm7XaUA+wm1ZlmL2HaTjMuu2GcVVD9NLrQ9s67QKo1LCiFe03+xC+LQQwR4DM nErDAh2KMsJpM+cd2oc3eIm7HzHI170z9I0b1G9EpULQxyDE8IVruBsTYJjTmEXqktwH vq95f5mgfrduc3vIVWTksT4pFN7xWKIjzXS8IFN1NuB8hny/jiCheQrNI33L9Jat+pP3 72Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741387225; x=1741992025; 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=mnovoaUMqprzKKHYFuoZMJZ/2zGWdVOJkellgnL8PG0=; b=KCT+3+96PCby4ng/nGlyf4zyR6Ngxz5UMIDncJA/2toyyy4VMYEl5o0yZWe5V2iaLE Z2/Cx6L/7E43ht3qvaiPgT6ZdJhUFKkILeaMmt6RKto65t2WU4lJpGv6xwKIV0LnaU1o jKQwih6orTuw3t36UCf8hjxkmUgyO+oRQixo+2PvZ53+orz0EqGUq5781GZPUeT9CDpQ 8QUiFls4PxkNszH176QXmRzMbBadP1pjha7guN7e0M+NqPKLpnVatL7mybXB4W+xsasl P9CKeRZKtHI/8FthfgS+p/P1E9MGnYyM9z6kWoYcYcLM1ZcnMrsPNuQPkn+J6BySq2or zdtA== X-Gm-Message-State: AOJu0YwR8+B/KQ1AHcrP0bYDY4H1WyzWhsXph063DfpCpJiFLoc4yPd2 qL6+Uygvc0+HpmdhTl6I1QiIRn3900/PNrnnCZKi+VCFwV/GbKeQgJWGDfTa8V1P+QNhxt2+R9N MjyY= X-Gm-Gg: ASbGncsZLWooeh0Ji1lrRyHFUVrE6Zr9SKWHOee399zb+nHu9c/JzQ4UB2ipZnjaf+3 MJULglcaDic7g9LElo0CbQY9Xc3ysjIPBcnjb9dFUuXkgY75koZrSsNvs7OVCMKTUB1dUpCsUQe tY8WKDjRunGQzyO6uNYkxYaPoUj+xS8mJhO2QFr62oxzZFlMe8SOcS4g8C2hCeQmZaN+GPpSoXC uoZHHZeNFBrG62pER9vJMQU2FdK3Cij0YNapBItUvthu3QSoruIfLscNIxXKQx2tXCZOARIPonM XjG1qzSI0751G65H08HfG8WMQSLptimJXuv5QpSBXd1JNmvFyDK88ENUU21mwXzpxr0TI1U34MC UvwicG/p+mJ42DekqTbk= X-Received: by 2002:a05:6000:471d:b0:391:20ef:6300 with SMTP id ffacd0b85a97d-39132d98c7dmr3250867f8f.37.1741387225570; Fri, 07 Mar 2025 14:40:25 -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-43bdd9471b7sm63627185e9.34.2025.03.07.14.40.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Mar 2025 14:40:25 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Marcel Apfelbaum , Igor Mammedov , Pierrick Bouvier , "Michael S. Tsirkin" , David Hildenbrand , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Ani Sinha , Richard Henderson , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 7/7] hw/virtio: Compile virtio-mem.c once Date: Fri, 7 Mar 2025 23:39:49 +0100 Message-ID: <20250307223949.54040-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250307223949.54040-1-philmd@linaro.org> References: <20250307223949.54040-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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 5288fe597b3..2e51dcfdf32 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'))