From patchwork Thu May 15 17:27:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 890217 Delivered-To: patch@linaro.org Received: by 2002:adf:fd8a:0:b0:3a1:f579:ae88 with SMTP id d10csp3269166wrr; Thu, 15 May 2025 10:29:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXfLjjgROU48WpBXXB2Gz14FD+0dCl3+smzkOW0aLu/22BlRN9l8Adp9yr33uPiJ7Ijy1E8KQ==@linaro.org X-Google-Smtp-Source: AGHT+IFZRoTDP8eSv9fYoPhO6Jz8hPkQpyO888BHlq/luth0exjN6uZMsQ7j5btGp/97fuON4G+B X-Received: by 2002:a05:620a:4549:b0:7c5:4c49:769c with SMTP id af79cd13be357-7cd46707c88mr67007685a.6.1747330198319; Thu, 15 May 2025 10:29:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1747330198; cv=none; d=google.com; s=arc-20240605; b=NMf9tGhLMSxvTWlRif2XkoaAtkyohZPFevnZ3VlvCYOx3LQTL5UBWO1g5l6l+xhW9I 7qEQqkAwTtNLMLDyU2WvPo4UhzrVwYaTsDgcCgKwL+oqqzyO3oe6VyoV588Rlj0Kj88n 7zSHn0wgJ6FMZ/KUTjAJE/lR29pUYUiAFH/xvs07cobO8tqJ9GXHUpbCIENjJlX6am4q Hij9Vr8BTywLYY2QRCVm/En+B6krq1Jprky/3IOIAWNv21rS1Yf8Qwc5Uubq3FjEHTpm +sEL5Q5zcsYcMoK02aCZdPROnbrt96y2pDOKpiWntj+A2ETikxhK0NWeXrI12FN6KH2s IBDw== 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=n2kksRWF5uMfLBl5C93UC3KpDnUA54+ae7RH/Q2zvUg=; fh=OJpaBvMmOsDyDUaboK7XVT1jzhwiftmC9hsBKL9dJIk=; b=Sj8zDjddB5X6VIsjrMsesiWtQgcPGHHQsZhEs4Di4XZDyENNtLRVuUuT2T7QzD3tZ/ 0Vv4DHQ29uZEqSDaOkNbevydxGF+24tn4+2xkteJzS/grJajyEdG1AZf+qW01Z8ijfv6 vzwaU7wA0XbAixw5kFNZf3mng9sZuk3kBqh+JJAgBSUC1qO1DiBqGe4hM2/l0yiGf6BK qnH8MkS0ZcaSak+AUTaim9Gikt+icXaWdcx8jyLH2V4NXISHvVAXczkWjVy0xjhNYfVj 9au+pfMGSWSlXBsDCZg+qju9h9WskVVIJfNQrzRvTBOyNkJzV5W6rBLWGc9/kZpd3S8j YCEQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=emgyDLkv; 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-7cd467cfaaasi16114085a.126.2025.05.15.10.29.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 May 2025 10:29:58 -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=emgyDLkv; 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 1uFcN0-00080C-BJ; Thu, 15 May 2025 13:27:46 -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 1uFcMx-0007rR-VL for qemu-devel@nongnu.org; Thu, 15 May 2025 13:27:44 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0: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 1uFcMv-00023W-QJ for qemu-devel@nongnu.org; Thu, 15 May 2025 13:27:43 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-7426159273fso1401123b3a.3 for ; Thu, 15 May 2025 10:27:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1747330060; x=1747934860; 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=n2kksRWF5uMfLBl5C93UC3KpDnUA54+ae7RH/Q2zvUg=; b=emgyDLkvLDOwPVMrWYu4P8R8/FyzN6eDNrMgg28nGXVkRUC9WlqafERkCmEI1EHC1E QyFH4mbEY5Qqn1gcaV6flf8TwVfYOYQ0u6yrKRbS5f+OsLJwaTJGrsSeit3LtUvz/7BM wn6AqECdw3sbID4bCNdInqCD0NnooY87D1eSUEKyGnHoZyXpeYR1DLObuj7B78fDN+uH T2iY4FcjumbRruyBVcHcjreh6QAmFhvK5P6mjcMpTDuI06XJgfx06nhi5fnV9vrHTIw1 xc5XNbphY0Kp6wz0doWG1JZMuOL6MYOIpX3rgvg7q1crIj3JHay799v9giyXX335hCWA 7Hxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747330060; x=1747934860; 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=n2kksRWF5uMfLBl5C93UC3KpDnUA54+ae7RH/Q2zvUg=; b=xSIkNo+tEIHJYkjIJUN6t3b0sLY/33G96MdY1bq/eQWiAB4P1ujGsYvNQ6mcd/Z7Hf +gP1Xn6bz4bXwlbQEMCXPq/qTf5LwcKqzXl8Gu9ImBMp3eB6dSYJdOifFOJpxuPGBDku pn1ME15ga20tlzO6cXXYJYNpy4x+BbVdNMCinP3l8xz61IWyjEU+GNcTemgdc/3ob3Je ZYvz9eIdASjgzppX9kw3FhpaPT98zLw0t84Cv9VSRqTpMi4B8C1ZeBHyKlRer6jZHmCI BvDjmczBeU6ixEaqJw8k6/klM1Jk+qTfF3nBAH2kKKbTk5Y8yVsQbz2nINds8VX+UkA/ /UrA== X-Gm-Message-State: AOJu0YxCd3DsMe4+K6v7WR+pNWtxR7YK39tMQoGOapeX6fVESbqGPWHi DvuRS18zYlMprOjz8Rw4pZ1/pNq7SwRfJxYlEFoUATa0fBdgZbnMQcRN2IEEm+x0sWxzt9F99Sf QWr+2 X-Gm-Gg: ASbGncv6ms5H+bF70HWv/2hMufYPuAl+Q458PIKUIfMigbuqE7nH856LmhmqrAUsenI 9wa+SNj1l7Yxpd5tgOrSXRV02h6KXb+Wn8ohftct2oSe8T8gpQhfAzFpEOg+hpNmOlWVmO8avp/ dwjZ/phpjpAQlwA+q/UYYCOEIDrhgiYSwCQ/iaiuP9CgIVIinFag1ukw5w6pxMuVDzbAoMB21BY fKc18TvjUFPHfQn7E5+psx1XWrK2ZRdvjjDnU4BizsD3n5b76zOyWDnmg/cYUw03vbZAp3oVZYl f0ib0nRGSYbI+3KM42XOZdX65hQ+Db7HsPDlOVKmprsaS5YEs3+hWq4/GrZt8g== X-Received: by 2002:a05:6a00:1495:b0:736:ff65:3fcc with SMTP id d2e1a72fcca58-742a98ab432mr269829b3a.16.1747330060278; Thu, 15 May 2025 10:27:40 -0700 (PDT) Received: from pc.. ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a96dfa9dsm79730b3a.10.2025.05.15.10.27.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 May 2025 10:27:39 -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 01/12] qapi: expose rtc-reset-reinjection command unconditionally Date: Thu, 15 May 2025 10:27:21 -0700 Message-ID: <20250515172732.3992504-2-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::430; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-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 From: Daniel P. Berrangé This removes the TARGET_I386 condition from the rtc-reset-reinjection command. This requires providing a QMP command stub for non-i386 target. 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. Rather than putting the command into misc.json, it is proposed to create misc-$TARGET.json files to hold commands whose impl is conceptually only applicable to a single target. This gives an obvious docs hint to consumers that the command is only useful in relation a specific target, while misc.json is for commands applicable to 2 or more targets. The current impl of qmp_rtc_reset_reinject() is a no-op if the i386 RTC is disabled in Kconfig, or if the running machine type lack any RTC device. The stub impl for non-i386 targets retains this no-op behaviour. However, it is now reporting an Error mentioning this command is not available for current target. Reviewed-by: Richard Henderson Signed-off-by: Daniel P. Berrangé Signed-off-by: Pierrick Bouvier --- qapi/misc-i386.json | 24 ++++++++++++++++++++++++ qapi/misc-target.json | 17 ----------------- qapi/qapi-schema.json | 1 + hw/i386/monitor.c | 2 +- stubs/monitor-i386-rtc.c | 11 +++++++++++ qapi/meson.build | 1 + stubs/meson.build | 1 + 7 files changed, 39 insertions(+), 18 deletions(-) create mode 100644 qapi/misc-i386.json create mode 100644 stubs/monitor-i386-rtc.c diff --git a/qapi/misc-i386.json b/qapi/misc-i386.json new file mode 100644 index 00000000000..d5bfd91405e --- /dev/null +++ b/qapi/misc-i386.json @@ -0,0 +1,24 @@ +# -*- Mode: Python -*- +# vim: filetype=python +# +# SPDX-License-Identifier: GPL-2.0-or-later + +## +# @rtc-reset-reinjection: +# +# This command will reset the RTC interrupt reinjection backlog. Can +# be used if another mechanism to synchronize guest time is in effect, +# for example QEMU guest agent's guest-set-time command. +# +# Use of this command is only applicable for x86 machines with an RTC, +# and on other machines will silently return without performing any +# action. +# +# Since: 2.1 +# +# .. qmp-example:: +# +# -> { "execute": "rtc-reset-reinjection" } +# <- { "return": {} } +## +{ 'command': 'rtc-reset-reinjection' } diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 42e4a7417dc..5d0ffb0164f 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -2,23 +2,6 @@ # vim: filetype=python # -## -# @rtc-reset-reinjection: -# -# This command will reset the RTC interrupt reinjection backlog. Can -# be used if another mechanism to synchronize guest time is in effect, -# for example QEMU guest agent's guest-set-time command. -# -# Since: 2.1 -# -# .. qmp-example:: -# -# -> { "execute": "rtc-reset-reinjection" } -# <- { "return": {} } -## -{ 'command': 'rtc-reset-reinjection', - 'if': 'TARGET_I386' } - ## # @SevState: # diff --git a/qapi/qapi-schema.json b/qapi/qapi-schema.json index 7bc600bb768..96f6aa44133 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-i386.json' } { 'include': 'misc-target.json' } { 'include': 'audio.json' } { 'include': 'acpi.json' } diff --git a/hw/i386/monitor.c b/hw/i386/monitor.c index 1921e4d52e9..79df96562f6 100644 --- a/hw/i386/monitor.c +++ b/hw/i386/monitor.c @@ -26,7 +26,7 @@ #include "monitor/monitor.h" #include "qobject/qdict.h" #include "qapi/error.h" -#include "qapi/qapi-commands-misc-target.h" +#include "qapi/qapi-commands-misc-i386.h" #include "hw/i386/x86.h" #include "hw/rtc/mc146818rtc.h" diff --git a/stubs/monitor-i386-rtc.c b/stubs/monitor-i386-rtc.c new file mode 100644 index 00000000000..d810f33efec --- /dev/null +++ b/stubs/monitor-i386-rtc.c @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-misc-i386.h" + +void qmp_rtc_reset_reinjection(Error **errp) +{ + error_setg(errp, + "rtc-reset-injection is only available for x86 machines with RTC"); +} diff --git a/qapi/meson.build b/qapi/meson.build index eadde4db307..3a9bd061047 100644 --- a/qapi/meson.build +++ b/qapi/meson.build @@ -64,6 +64,7 @@ if have_system 'qdev', 'pci', 'rocker', + 'misc-i386', 'tpm', 'uefi', ] diff --git a/stubs/meson.build b/stubs/meson.build index 63392f5e785..9907b54c1e6 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-i386-rtc.c')) endif if have_system or have_user