From patchwork Fri Jun 20 17:13:30 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: 898350 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f54:0:b0:3a4:ee3f:8f15 with SMTP id cm20csp1454474wrb; Fri, 20 Jun 2025 10:20:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXCFincLH0q2ianNb1opLFOjFasBr0NDgqbGGh26A+RUZNZWkvAutJg3c4bPtNRnCybwHKEFg==@linaro.org X-Google-Smtp-Source: AGHT+IGe1k3ztH+S9PcQhgddrOBCma54E7ectqh/SwHBQfjBik/Ld+ewPre+A5TkJqXMso9Y6a26 X-Received: by 2002:a05:622a:4d8b:b0:49d:89bf:298f with SMTP id d75a77b69052e-4a77a209051mr59519321cf.22.1750440041585; Fri, 20 Jun 2025 10:20:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1750440041; cv=none; d=google.com; s=arc-20240605; b=Eu+x4/tt1l4YJGAvwK/QoHaOrOWyYKjvERWxElDfeMWae8agrxlSxU8FQz+f9ZJ86S gpYxalI7Nplts9+uu/ANQzqUFweNiLh1Aa9ZEzTMuc5Ko4mmltnUQauzJRZBWfNIUhpD 79AwYkIAOudDCi9l4N49zIK8jZgNV8hXE+0BMjLjrzzHbviePmTkW6m+bLx4bNyeZn45 h5Lp+gZBCYkO+kJf6IZY4Djlt/KhCD1NbD/9uSmtXMHVvAUY8tJhIAEVqOyxhSTZCCqa /VGfO1y+dL++/k9yRHawOBp1f0+OUMMeD3ucLffmZfa7g9mgCALbIN99F9RQ1C+2MIKP h/XA== 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=CTeMJjNyNvpDzcgK78dXTDRXnTQKYPQw/ldYN09UYyU=; fh=8f2AL0Su0K9UlZksY2EEcc9O+An+AQ/T/SEdbs2pdSA=; b=IL5+nfc1Y7G7DIiVOFqo9TsKPEcz+kr4aBUKexyDpk9j1+2EC8uT74UokNzMuK+bJV YUFf7fTV83DhyzeVVhRFkW5zN2argTX9hqs7tP7Lhl8/Gf7vvbiN3MbRF9in9SOTj5r8 g6WLVt7jDlbRBAb4JaHrrGLXLbWPH5CysIg24nSRAJcyd7V/+l3L5B0OV1VxRB3K2lqx q20Dj9Pol1yIiUtlKiJ1OMpIEXnl6Gpb5CTzn8ayf6ZdfdgwGu7wkZaM2DK8H9Nf5nCh mqQLK4ARQzlCPybWcwPlNXhuccjApnJ/cMuJrKdsV3IB/knGC08GboRqGCYk0kuvAbjU HLsw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=frkOILCD; 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-4a77a0e45dbsi21301271cf.557.2025.06.20.10.20.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Jun 2025 10:20:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=frkOILCD; 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 1uSfMm-00058D-2a; Fri, 20 Jun 2025 13:17:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uSfM9-0003oX-8G for qemu-devel@nongnu.org; Fri, 20 Jun 2025 13:16:49 -0400 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 1uSfM7-0004h9-9t for qemu-devel@nongnu.org; Fri, 20 Jun 2025 13:16:48 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-451dbe494d6so23584405e9.1 for ; Fri, 20 Jun 2025 10:16:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1750439805; x=1751044605; 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=CTeMJjNyNvpDzcgK78dXTDRXnTQKYPQw/ldYN09UYyU=; b=frkOILCDjE0xE4nABt8trZf7rJiI84t2J7HKeYMUJKwOZYiDFQONDO+RhtWYNCMEYy gADfwOoGq21beY/lOXMgw0WBf1h0R9KA93vVanTG5s8rDKbIzEHSjrORSIG10IChM1tN yGOGVeRCOCNKM3kPY5vUshk9wA4kyvC8VLNAvKm028J7mTcik0nkLajdaTNw8Z/fzRDb YrmbDOgQ540W6J197+EZpC7fq/HlbzoLyQELCPG8qIBeZ89GME8ahwlT9zDyBLXaf7+F /GQ0cSGYWM6VLRgY9wGK2DXhXfOoMqGjeWG6XCqnlb+RttKCb1eQvPFmO5I4hXGQrNzd eekg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750439805; x=1751044605; 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=CTeMJjNyNvpDzcgK78dXTDRXnTQKYPQw/ldYN09UYyU=; b=btaF0PvhWVrO16bBbA2itWgg2t7b3MGsUdtl9WrcXwaEJB4YgViryQ42gejo/7pNF3 KnS2oWsVzn1zKJa/ocEYtqf0b6EiEplt95uFATA85POP7e+c4N3iYnEBFBLbcSbVJHMF d0TdaxQMSg6agR/9Za0b379kMMzL1zbO8wh91KORkuTHkBZuvVGrqP04/0tymlHidHtX nXo0IO/47IDhTqqA7n12WMWZoJ3sHJmhlQanXsEd7qTlLM8fgGYZSQdfzsY7l7CDvph7 fdx/0MG7629DYSBb4XS2ZoEdflXJXXCw8r0JdwGYjxmqjhRJAhcd4gwl4/+h6ypMHhSw H0AA== X-Gm-Message-State: AOJu0YwfNW13wbNim2+Eg81irOQUt2hrL7kwVRBUhC4VvS62DNUuZ382 A9O/MHoVWnmElEnvSCM1LDK6zBs28bsR8ZFnO208L0zz7+WrFdsIyA18/J8JaRPbF/ahlH1VA5q an6yZjeg= X-Gm-Gg: ASbGncsW3mN4ZWRb8nrRNch3k2dK8KeINQeVYgdzBeo0DQybdvASnywdWYVseA6Cp34 546oIl9nPAx7/STvbiWTg9Uj5ICqDtMeflb/ygjj5GNdWG19/P4+V81hSRJRPgo/R5ocpLmo87a gK+a7UPk5rboP8rYBK+BVk4BiEedhF8h4NZqzGA/5oJAK1Nl8tS534toBb2OxqIEJXyl1sITtsE 1BPEu1NQLxVkmR9JePC6/esNi/mYrUrbLu5ba4FfTyzC3TWaZvbmyB/HDYvEckvkebaW/j91Dj9 zuHFDJOWNAkI9/Bv9xH2+SCPcB7Mn3XKl3IhmWA9AxcooORkgXIo/PQhHZG5KYQjYfiVolxqVvq evfXvNtbFE/UTYqUlvfEUcGE9dFKAvL4QrUMa X-Received: by 2002:a05:600c:4747:b0:450:d37c:9fc8 with SMTP id 5b1f17b1804b1-453659c0a51mr31415225e9.13.1750439805241; Fri, 20 Jun 2025 10:16:45 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535ead2a1bsm66117935e9.33.2025.06.20.10.16.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 20 Jun 2025 10:16:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Alexander Graf , Richard Henderson , Pierrick Bouvier , Peter Maydell , Thomas Huth , Cameron Esfahani , Julian Armistead , Paolo Bonzini , "Edgar E. Iglesias" , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [RFC PATCH v2 37/48] accel/nvmm: Expose nvmm_enabled() to common code Date: Fri, 20 Jun 2025 19:13:30 +0200 Message-ID: <20250620171342.92678-38-philmd@linaro.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250620171342.92678-1-philmd@linaro.org> References: <20250620171342.92678-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 Currently nvmm_enabled() is restricted to target-specific code. By defining CONFIG_NVMM_IS_POSSIBLE we allow its use anywhere. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/system/nvmm.h | 23 ++++++++++++----------- accel/stubs/nvmm-stub.c | 12 ++++++++++++ target/i386/nvmm/nvmm-all.c | 6 ------ accel/stubs/meson.build | 1 + 4 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 accel/stubs/nvmm-stub.c diff --git a/include/system/nvmm.h b/include/system/nvmm.h index 6971ddb3a5a..7390def9adb 100644 --- a/include/system/nvmm.h +++ b/include/system/nvmm.h @@ -13,17 +13,18 @@ #define QEMU_NVMM_H #ifdef COMPILING_PER_TARGET - -#ifdef CONFIG_NVMM - -int nvmm_enabled(void); - -#else /* CONFIG_NVMM */ - -#define nvmm_enabled() (0) - -#endif /* CONFIG_NVMM */ - +# ifdef CONFIG_NVMM +# define CONFIG_NVMM_IS_POSSIBLE +# endif /* !CONFIG_NVMM */ +#else +# define CONFIG_NVMM_IS_POSSIBLE #endif /* COMPILING_PER_TARGET */ +#ifdef CONFIG_NVMM_IS_POSSIBLE +extern bool nvmm_allowed; +#define nvmm_enabled() (nvmm_allowed) +#else /* !CONFIG_NVMM_IS_POSSIBLE */ +#define nvmm_enabled() 0 +#endif /* !CONFIG_NVMM_IS_POSSIBLE */ + #endif /* QEMU_NVMM_H */ diff --git a/accel/stubs/nvmm-stub.c b/accel/stubs/nvmm-stub.c new file mode 100644 index 00000000000..cc58114ceb3 --- /dev/null +++ b/accel/stubs/nvmm-stub.c @@ -0,0 +1,12 @@ +/* + * NVMM stubs for QEMU + * + * Copyright (c) Linaro + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "system/hvf.h" + +bool nvmm_allowed; diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index 5c8e2857a8b..46a57c78feb 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -1192,12 +1192,6 @@ nvmm_accel_init(MachineState *ms, AccelState *as) return 0; } -int -nvmm_enabled(void) -{ - return nvmm_allowed; -} - static void nvmm_accel_class_init(ObjectClass *oc, const void *data) { diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 8ca1a4529e2..4c34287215f 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -3,5 +3,6 @@ system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) system_stubs_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c')) +system_stubs_ss.add(when: 'CONFIG_NVMM', if_false: files('nvmm-stub.c')) specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss)