From patchwork Thu May 15 17:27:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 890216 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3269119wrr; Thu, 15 May 2025 10:29:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUXzqayrV/q/to6K8Ua06KByDAFUjoA5J/dUIj6E8BhbivHobbRRRt/S5Fwn841umx03Jm3SA==@linaro.org X-Google-Smtp-Source: AGHT+IHz+HFkSort4SUMQ76Br9NpdIaXPqUN8Ae0J1uv9jOsHKCLal+5C+kh/yDiqdN4O/X3CK5j X-Received: by 2002:a05:620a:6019:b0:7be:73f6:9e86 with SMTP id af79cd13be357-7cd39e1b140mr717436985a.20.1747330188951; Thu, 15 May 2025 10:29:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747330188; cv=none; d=google.com; s=arc-20240605; b=QI+VnSINp/UIQBicNgEJ2RRy78J0+eW1RZP27liukFZCqTveoRQxyuh+PsZF/G3JZd v/HD2WZg7GtbrxX8uBrmgXYrvE/ewdrsXbnHu3XE2sRlMW+WMRKjTudAFPDprs6CwplJ ZySlT6v9dbrKXckR9rIzn/L4d4cqvg2kVrzmC8EDDOubTxQb4WGkzmYU64C1+UeDkN4/ EYj6pBW7GW8kwocg01ZDwgDEFjpZ/7uauBG0vtksGyVAKuDwXUIwRfpMyMncWvSx/H6I sr5EhMhqTi97Qmz75BpUhJK3z1N4GRsFOJ2vjes3nrPB6Xx7F+MFpi9flyv92tBm7h7Q SKFg== 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=otN1ZYxqLIukz5ceFORIX+3/pUpnYfvslClWMIlE2/E=; fh=OJpaBvMmOsDyDUaboK7XVT1jzhwiftmC9hsBKL9dJIk=; b=WDHZO/hF7+WKJYjl/RjEbIVNHq30xg7Ayv/i6L2ja9lBwYrBZfialQzUrAhLAPEbn3 hpYV5RD97FiFRnlD874THByYUynas0x3rl9Ad8rD/VTY+iNIE89PBUjgAWHS5gxMUMVw 7EpVCaFi06kPo144cX9P5mOWQIDWUDyWeYOaLETor+j2B8rTcDaf8NP1AJ1x3cuT0ysE LMz2WbX0RIDccKvEHE75jiXv9OoG7pj6Xp/o+ge4V/11ePFPKrfLK5VJxaKQVGqNtcMb w+fW5pEVjwyBbAa/JDJsqJxH+iA4m+eQ/UP3hAUlmPP8M34u/+SnG3s7e5kPy87kSJmL 2p3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mIFk2dlY; 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-7cd4688c506si13868985a.303.2025.05.15.10.29.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 10:29:48 -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=mIFk2dlY; 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 1uFcN7-0008WV-LG; Thu, 15 May 2025 13:27:53 -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 1uFcN1-000864-Dv for qemu-devel@nongnu.org; Thu, 15 May 2025 13:27:47 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uFcMy-00024v-L0 for qemu-devel@nongnu.org; Thu, 15 May 2025 13:27:46 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-7399838db7fso1299728b3a.0 for ; Thu, 15 May 2025 10:27:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747330063; x=1747934863; 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=otN1ZYxqLIukz5ceFORIX+3/pUpnYfvslClWMIlE2/E=; b=mIFk2dlY3M5Fga8pDPqGHQNos8XVmfQIwpv5zFyemVf1WryUWasBySwygi5vww1X9x exfRberrgAudnTcAg0wxRrFGWB2m0xvx0FYaEk/ZuFrk2PiUSxqDEKZVmFNBYwQ35PG4 I34ty7UQRdP4xh4uH2oOpBkT6eRhdSX/hRFLFzbQ0brMUjVK/eiehGBF4Ep/srhRzlNk hUSperD/DtYLyuokszStlUC9NvwmhjtN1YaDcHhopbBJPlthmR/r9oZUaaXmVE9yxNC9 wJJcah6mPVs9v5pZfQp/6PQr3/wlXyxzphmSOs+CpXQxL1eMllb42THlJVD1ld6vy5x0 lU1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747330063; x=1747934863; 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=otN1ZYxqLIukz5ceFORIX+3/pUpnYfvslClWMIlE2/E=; b=kCXng6hQW+v8jxJ3JA+MddRsKxHmlNUzH5AXO5K/6LNq3JPdGnPDFFBp7ysQDSKnOs bRQhFhU1RQB5Ao2VaE8Siu7JTlpoc930OC4k0cG12KGmRCpx79FnbatfcsmPIbIBOT4L SFdGiLetrskvmDF6Cn70KFg3iCnyU3C9hQU47zUeIvklxqvWZigbW00XCTLUDyZvkZrP OUBvw0OwGXGfEkQiTjH9te6uZrfmH3u9Wt5Tkf2ialOCiLL1tlueIQDshdCqpUVW8nGx 0LktayGRBei3vTUj3RXcrVmIZGL07eUaz1xYxbSeEUmBOulA0DY8cBUUi6XiPBLQKLi4 Js4Q== X-Gm-Message-State: AOJu0Ywen188F7f0kQV0VgsZBn74yE6VH9qWUUWXcnYZ4YgCcya5+87v FBGgtRtLBmuYuT7a5N17DyTtK53GIE4hS8K3Q0LydDpURhQHDokKef8kmH2WJfB/4LcjCo8fjfM 7ixwP X-Gm-Gg: ASbGnct1Z+dt4zW3K339obIH//SilvJer0pZaSupC7hDiDghleTfZvD7UaTRWmlvdaY sQqRVdUbbg03BVWqIedTSd1QrtHdAb8TkROWkFk0UM22dHgb/1gSLvanXtjqVV5ZWrnKEnQVmfz YJUzv+WbTQYuPaz/qR4Gga6LJlgvHrCwFPRHRxpQ1XQhUbpKpa6sx0sVwzoh4jItuDWSN5c1ZCf jpUJSpraEooMuOs+coCoj9S73LfP7/7ybr9/e/RYB7i0rIFzu2rqKm2S8pDwqPMmVkXsh9VKTeh UhHS28BODla4vZRjLgKzDijmj+Hv69GzZ4jwqyQxTY2mfAM8hQg= X-Received: by 2002:aa7:9a8c:0:b0:73b:ac3d:9d6b with SMTP id d2e1a72fcca58-742a9a282demr219937b3a.4.1747330063010; Thu, 15 May 2025 10:27:43 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a96dfa9dsm79730b3a.10.2025.05.15.10.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 10:27:42 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Thomas Huth , Richard Henderson , Michael Roth , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , berrange@redhat.com, Markus Armbruster , Peter Maydell Subject: [PATCH v2 04/12] qapi: expose query-gic-capability command unconditionally Date: Thu, 15 May 2025 10:27:24 -0700 Message-ID: <20250515172732.3992504-5-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250515172732.3992504-1-pierrick.bouvier@linaro.org> References: <20250515172732.3992504-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42f.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 From: Daniel P. Berrangé This removes the TARGET_ARM condition from the query-gic-capability command. This requires providing a QMP command stub for non-ARM targets. This in turn requires moving the command out of misc-target.json, since that will trigger symbol poisoning errors when built from target independent code. Following the earlier precedent, this creates a misc-arm.json file to hold this ARM specific command. Reviewed-by: Richard Henderson Signed-off-by: Daniel P. Berrangé Signed-off-by: Pierrick Bouvier --- qapi/misc-arm.json | 49 +++++++++++++++++++++++++++++++++++++++ qapi/misc-target.json | 44 ----------------------------------- qapi/qapi-schema.json | 1 + stubs/monitor-arm-gic.c | 12 ++++++++++ target/arm/arm-qmp-cmds.c | 2 +- qapi/meson.build | 1 + stubs/meson.build | 1 + 7 files changed, 65 insertions(+), 45 deletions(-) create mode 100644 qapi/misc-arm.json create mode 100644 stubs/monitor-arm-gic.c diff --git a/qapi/misc-arm.json b/qapi/misc-arm.json new file mode 100644 index 00000000000..f5341372f5a --- /dev/null +++ b/qapi/misc-arm.json @@ -0,0 +1,49 @@ +# -*- Mode: Python -*- +# vim: filetype=python +# +# SPDX-License-Identifier: GPL-2.0-or-later + +## +# @GICCapability: +# +# The struct describes capability for a specific GIC (Generic +# Interrupt Controller) version. These bits are not only decided by +# QEMU/KVM software version, but also decided by the hardware that the +# program is running upon. +# +# @version: version of GIC to be described. Currently, only 2 and 3 +# are supported. +# +# @emulated: whether current QEMU/hardware supports emulated GIC +# device in user space. +# +# @kernel: whether current QEMU/hardware supports hardware accelerated +# GIC device in kernel. +# +# Since: 2.6 +## +{ 'struct': 'GICCapability', + 'data': { 'version': 'int', + 'emulated': 'bool', + 'kernel': 'bool' } } + +## +# @query-gic-capabilities: +# +# It will return a list of GICCapability objects that describe its +# capability bits. +# +# On non-ARM targets this command will report an error as the GIC +# technology is not applicable. +# +# Returns: a list of GICCapability objects. +# +# Since: 2.6 +# +# .. qmp-example:: +# +# -> { "execute": "query-gic-capabilities" } +# <- { "return": [{ "version": 2, "emulated": true, "kernel": false }, +# { "version": 3, "emulated": false, "kernel": true } ] } +## +{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'] } diff --git a/qapi/misc-target.json b/qapi/misc-target.json index ba4403a9241..d36292b3321 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -2,50 +2,6 @@ # vim: filetype=python # -## -# @GICCapability: -# -# The struct describes capability for a specific GIC (Generic -# Interrupt Controller) version. These bits are not only decided by -# QEMU/KVM software version, but also decided by the hardware that the -# program is running upon. -# -# @version: version of GIC to be described. Currently, only 2 and 3 -# are supported. -# -# @emulated: whether current QEMU/hardware supports emulated GIC -# device in user space. -# -# @kernel: whether current QEMU/hardware supports hardware accelerated -# GIC device in kernel. -# -# Since: 2.6 -## -{ 'struct': 'GICCapability', - 'data': { 'version': 'int', - 'emulated': 'bool', - 'kernel': 'bool' }, - 'if': 'TARGET_ARM' } - -## -# @query-gic-capabilities: -# -# This command is ARM-only. It will return a list of GICCapability -# objects that describe its capability bits. -# -# Returns: a list of GICCapability objects. -# -# Since: 2.6 -# -# .. qmp-example:: -# -# -> { "execute": "query-gic-capabilities" } -# <- { "return": [{ "version": 2, "emulated": true, "kernel": false }, -# { "version": 3, "emulated": false, "kernel": true } ] } -## -{ 'command': 'query-gic-capabilities', 'returns': ['GICCapability'], - 'if': 'TARGET_ARM' } - ## # @SGXEPCSection: # diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 96f6aa44133..e96bff8d38c 100644 --- a/qapi/qapi-schema.json +++ b/qapi/qapi-schema.json @@ -61,6 +61,7 @@ { 'include': 'replay.json' } { 'include': 'yank.json' } { 'include': 'misc.json' } +{ 'include': 'misc-arm.json' } { 'include': 'misc-i386.json' } { 'include': 'misc-target.json' } { 'include': 'audio.json' } diff --git a/stubs/monitor-arm-gic.c b/stubs/monitor-arm-gic.c new file mode 100644 index 00000000000..b3429243ef8 --- /dev/null +++ b/stubs/monitor-arm-gic.c @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-misc-arm.h" + + +GICCapabilityList *qmp_query_gic_capabilities(Error **errp) +{ + error_setg(errp, "GIC hardware is not available on this target"); + return NULL; +} diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c index a1a944adb43..ef18c867ca4 100644 --- a/target/arm/arm-qmp-cmds.c +++ b/target/arm/arm-qmp-cmds.c @@ -27,7 +27,7 @@ #include "qapi/visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-commands-machine-target.h" -#include "qapi/qapi-commands-misc-target.h" +#include "qapi/qapi-commands-misc-arm.h" #include "qobject/qdict.h" #include "qom/qom-qobject.h" diff --git a/qapi/meson.build b/qapi/meson.build index 3a9bd061047..5e93e6b8cfd 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -64,6 +64,7 @@ if have_system 'qdev', 'pci', 'rocker', + 'misc-arm', 'misc-i386', 'tpm', 'uefi', diff --git a/stubs/meson.build b/stubs/meson.build index 9922ec7b88e..07e9d3799a5 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -77,6 +77,7 @@ if have_system stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('win32-kbd-hook.c')) stub_ss.add(files('xen-hw-stub.c')) + stub_ss.add(files('monitor-arm-gic.c')) stub_ss.add(files('monitor-i386-rtc.c')) stub_ss.add(files('monitor-i386-sev.c')) endif