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) {