From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646048062; cv=none; d=zohomail.com; s=zohoarc; b=i9/hpAUZ5o/2p3Q56NxN5xaW+xUIkqBfcHZvsdk5Wji8lM3ChGscj7Bmsi9ZjWyYrq92bqEwWXYTGMcd23uVbdTcthUsqr9zBUkUrIWjvEHTJRjUzi3sRM5a/PXp/DgiSyLZuzA9Xc4+oqbz8J+pLo8id4xt2ldWpIr104u4qJw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646048062; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AEciAsrZFCKw7eCLaL1HoVu8avXfMjhDXlSqnUIkgmU=; b=aXaksnu/zjTRunH/6t6jeUlMSYp5Lnr6GMK7/OmfkP9WGEEahHPNbLmtkiSaZWNVAwu6SQdVYjW/hAjHswmW0/0+VDZ12VRfnkwzILl+o4Lz9sfPK4KvcJBY+pqLjsoMtA7jgcdihq3Bf5YeWueNff7yRF9p74VMRvsaJokVFoE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646048062882601.8472939046048; Mon, 28 Feb 2022 03:34:22 -0800 (PST) Received: from localhost ([::1]:51586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeIH-000437-UT for importer@patchew.org; Mon, 28 Feb 2022 06:34:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAe-00046C-70 for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:21048) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAX-000782-P6 for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-556-xDlJxPlzMsWFlenC_MhOzg-1; Mon, 28 Feb 2022 06:26:17 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B33E801DDB; Mon, 28 Feb 2022 11:26:16 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BAE07554E; Mon, 28 Feb 2022 11:26:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C6B0421E6A01; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AEciAsrZFCKw7eCLaL1HoVu8avXfMjhDXlSqnUIkgmU=; b=WjPBaZv9yTxd1+c8BJ+n6wL3JrpTlmLR245hs/Q4ZwmiRvT26Rekb/4oXGAj24YRNSFRYq dOwUBhaDM4vFjnInJ0YFBm8KWcVGCUjXmPe+V0ZCoiry8mhOYHrZPSUgyVqL78FZnp+7NC HmBI48c83QVqlKpY3HWUVvk0ZPCG7EQ= X-MC-Unique: xDlJxPlzMsWFlenC_MhOzg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/9] scripts/qapi: minor delinting Date: Mon, 28 Feb 2022 12:26:05 +0100 Message-Id: <20220228112613.520040-2-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org, John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646048065204100003 Content-Type: text/plain; charset="utf-8" From: John Snow Get isort and pylint tools passing again. Signed-off-by: John Snow Message-Id: <20220211183650.2946895-1-jsnow@redhat.com> Reviewed-by: Markus Armbruster [Comment explaining good-names-rgxs tweaked] Signed-off-by: Markus Armbruster --- scripts/qapi/commands.py | 2 +- scripts/qapi/pylintrc | 16 ++++++---------- scripts/qapi/types.py | 6 +++++- scripts/qapi/visit.py | 6 +++++- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index 869d799ed2..38ca38a7b9 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -25,8 +25,8 @@ QAPIGenC, QAPISchemaModularCVisitor, build_params, - ifcontext, gen_special_features, + ifcontext, ) from .schema import ( QAPISchema, diff --git a/scripts/qapi/pylintrc b/scripts/qapi/pylintrc index b259531a72..a724628203 100644 --- a/scripts/qapi/pylintrc +++ b/scripts/qapi/pylintrc @@ -34,16 +34,12 @@ disable=3Dfixme, =20 [BASIC] =20 -# Good variable names which should always be accepted, separated by a comm= a. -good-names=3Di, - j, - k, - ex, - Run, - _, - fp, # fp =3D open(...) - fd, # fd =3D os.open(...) - ch, +# Good variable names regexes, separated by a comma. If names match any re= gex, +# they will always be accepted. +# +# Suppress complaints about short names. PEP-8 is cool with them, +# and so are we. +good-names-rgxs=3D^[_a-z][_a-z0-9]?$ =20 [VARIABLES] =20 diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index 3013329c24..477d027001 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -16,7 +16,11 @@ from typing import List, Optional =20 from .common import c_enum_const, c_name, mcgen -from .gen import QAPISchemaModularCVisitor, gen_special_features, ifcontext +from .gen import ( + QAPISchemaModularCVisitor, + gen_special_features, + ifcontext, +) from .schema import ( QAPISchema, QAPISchemaEnumMember, diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index e13bbe4292..380fa197f5 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -21,7 +21,11 @@ indent, mcgen, ) -from .gen import QAPISchemaModularCVisitor, gen_special_features, ifcontext +from .gen import ( + QAPISchemaModularCVisitor, + gen_special_features, + ifcontext, +) from .schema import ( QAPISchema, QAPISchemaEnumMember, --=20 2.35.1 From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646048577; cv=none; d=zohomail.com; s=zohoarc; b=bS0+5MJUgb1cVjUiCQz8TnRwWaHc/oQR+YL0AbxBlRnfmnr/e0Lj//o5OU2aiYI/jrPx2px9XCa6EG3VFPLUpRTHbpSwFRQiWjHB9+zWzNy4Hldh3l48spSOZeVTo9JFZKXP6WIMbs4JG2SQWwq4m8F2BsHu4ORtXdGyzr9uyQQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646048577; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2ha58A0v4WbyZFzyt4Oly5tNGHbMMfXoC3AZ2Fshd3g=; b=ahMblJKeKS74W4AxkOkmWRcCcYm6s7jkq90CwnZI+NXwAj9QXdF850OZWGFUSRalvIO7Pc0BV5HAl2p+3fUJd10TGZVXzJmHMpw3k3grQWOx4ceO4mhU0MUn5BKouhezQlu7Sp5f1kz5LVzjJwjeLZQBIRLPvjiV0r7IsvXHfNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646048577562391.8356346497437; Mon, 28 Feb 2022 03:42:57 -0800 (PST) Received: from localhost ([::1]:36570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeQa-00056B-JV for importer@patchew.org; Mon, 28 Feb 2022 06:42:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAe-000468-8n for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAX-00077n-Nr for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-602-koqScLNgOSW7GLi97ER5vQ-1; Mon, 28 Feb 2022 06:26:16 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E3841006AA5; Mon, 28 Feb 2022 11:26:15 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CD037B6F1; Mon, 28 Feb 2022 11:26:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C8D4221E6A02; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2ha58A0v4WbyZFzyt4Oly5tNGHbMMfXoC3AZ2Fshd3g=; b=XJpV6tKepD2iSjksxrVl6qklBr+hFIRRlBDDBApk8NaXUJyJLPz9s5yn3wwHeNip3tY6QC 0McmKHsVQqqn265b5juTOTbkPy2sB9eytldHo+maVu1Lmtpf8YvMKhvlwuvEWIu/E+Pdxz DghalDEFwKzOlW+wPm1HV0wkE2D7mhA= X-MC-Unique: koqScLNgOSW7GLi97ER5vQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 2/9] keyval: Fix grammar comment to cover downstream prefix Date: Mon, 28 Feb 2022 12:26:06 +0100 Message-Id: <20220228112613.520040-3-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646048579109100001 Content-Type: text/plain; charset="utf-8" According to the grammar, a key __com.redhat_foo would be parsed as two key fragments __com and redhat_foo. It's actually parsed as a single fragment. Fix the grammar. Signed-off-by: Markus Armbruster Message-Id: <20220218145551.892787-2-armbru@redhat.com> --- util/keyval.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/keyval.c b/util/keyval.c index 904337c8a1..0cf2e84dc8 100644 --- a/util/keyval.c +++ b/util/keyval.c @@ -16,7 +16,9 @@ * key-vals =3D [ key-val { ',' key-val } [ ',' ] ] * key-val =3D key '=3D' val | help * key =3D key-fragment { '.' key-fragment } - * key-fragment =3D / [^=3D,.]+ / + * key-fragment =3D qapi-name | index + * qapi-name =3D '__' / [a-z0-9.-]+ / '_' / [A-Za-z][A-Za-z0-9_-]* / + * index =3D / [0-9]+ / * val =3D { / [^,]+ / | ',,' } * help =3D 'help' | '?' * --=20 2.35.1 From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646047863; cv=none; d=zohomail.com; s=zohoarc; b=ND+rqSfAiDS56/1R5gE+y3aBBFmI/gwOUpkpuQyGG3zGrcum+DA08fQ1LkyZdD9IOZss+Tr9+zFkDGyuTDRRaEcLVcjHfaFYsHeQKuF3gmJrp9pa9RyEhbU2XQpyJmZVl+I707r/1WgoRmuOVOQFnyWh1uofRs+PAmo4YLNW9qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646047863; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LDf8QRaqwrv2HzN0BtwqeB0PDm8aN/poneU911d5t20=; b=gyLoE8vTeQJ5k5AygRBpDpy3Lb9GsUDzM8CrI10jjdwQ6Mqs4DGyuR0DTZE15+7dOi9MQBnFaBhaCUbIY2xUKixMpElKh9c5MRYwkFfLznKW1FfmOOVlSAo1naI+5cmQYVLvHGTmfcfjJEnlJalPpHYStmDV85sAyisWJH8sSAQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646047863156991.4074222611665; Mon, 28 Feb 2022 03:31:03 -0800 (PST) Received: from localhost ([::1]:44970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeF4-0007nk-Bi for importer@patchew.org; Mon, 28 Feb 2022 06:31:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAZ-00044i-Gm for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40045) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAU-00077Y-Mi for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:19 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-322-SqiWMTfUNcGZaK6lgH3s3g-1; Mon, 28 Feb 2022 06:26:16 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8C6C8180FD71; Mon, 28 Feb 2022 11:26:15 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 52955797CB; Mon, 28 Feb 2022 11:26:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CAE3A21E6A03; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LDf8QRaqwrv2HzN0BtwqeB0PDm8aN/poneU911d5t20=; b=ToiC/ZAb+JhJsRqTfNhZFUpHwQ/AvHQe+pXEfuXAyfMktdqWty6BsLie2sYMGKniN7PL+y TJ9YxiddVEI3Q1zDtk+ZsN6aKPwbGyDzEQsLP6ddgqlMCfxu6dCC53ZKbhAfUQT1dPAZ4f v2MtBsSmHlDpghglujJhZSgCufjnP7o= X-MC-Unique: SqiWMTfUNcGZaK6lgH3s3g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 3/9] qapi: Fix stale reference to scripts/qapi.py in a comment Date: Mon, 28 Feb 2022 12:26:07 +0100 Message-Id: <20220228112613.520040-4-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646047865546100001 Signed-off-by: Markus Armbruster Message-Id: <20220218145551.892787-3-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qapi/qapi-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c index fda7044539..63596e11c5 100644 --- a/qapi/qapi-util.c +++ b/qapi/qapi-util.c @@ -113,7 +113,7 @@ bool qapi_bool_parse(const char *name, const char *valu= e, bool *obj, Error **err * may contain only letters, digits, hyphen and period. * The special exception for enumeration names is not implemented. * See docs/devel/qapi-code-gen.txt for more on QAPI naming rules. - * Keep this consistent with scripts/qapi.py! + * Keep this consistent with scripts/qapi-gen.py! * If @complete, the parse fails unless it consumes @str completely. * Return its length on success, -1 on failure. */ --=20 2.35.1 From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646048085; cv=none; d=zohomail.com; s=zohoarc; b=RKqwUcjk+RGdLN3g3wNhEYiSywty8AKMsKr/gVZfoCr/IDqp6eKfX6E/ptmsrjPCyvJlEE1rp6tpgt1beFnYZnerfCz5k6FJJeff+oL9OQpc5lWCxkf6OFAsz+tVdROTiwPyVZdiyU55COh2QDWz70SczajgtjiTaszYE0esnIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646048085; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/WribdSqBDrS9EBFUPb/GxDSQEjGsdR9Dd4RYOl2eBg=; b=kFv+eCNR5TcHcq4F2hif92GAHc4u2dBL2klxSTWRqPbTSkQI3o8eTEoZO2CxofI2gAWBJAqEWwNO9XQz68NKL9Oif3yDO/9mfx1GpDzLoRatFwQo7aI5zNz7OnVf3Bak7+F5pufZLYLlGusa88v9YdFqR8RbxZ9teD4k+wv7SKk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646048085353816.5231132794427; Mon, 28 Feb 2022 03:34:45 -0800 (PST) Received: from localhost ([::1]:52454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeIe-0004dP-7D for importer@patchew.org; Mon, 28 Feb 2022 06:34:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAe-00046w-6X for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:20111) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAX-00077v-OJ for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-663-ZIJoPuM0MYm3Lpl28UPY1w-1; Mon, 28 Feb 2022 06:26:16 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92D54824FA6; Mon, 28 Feb 2022 11:26:15 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C5DE4E2A6; Mon, 28 Feb 2022 11:26:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CCF4021E6A3E; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/WribdSqBDrS9EBFUPb/GxDSQEjGsdR9Dd4RYOl2eBg=; b=YBbYwWFKJCAkP1jAnOdX3vnvSgoTBQmo13q23BY+fdLAZPlv4SHsEZHnWemLyC1G62Jxcw vGN/7RkZaJg01iwhbuQRVmn0p8+EjeVRVF6aDNIuIy8TXoE+O9kxNtON3TGgLOSG0cnoOy LeSLu5ufj+K9nmsc1mSp2+mc10XDFPU= X-MC-Unique: ZIJoPuM0MYm3Lpl28UPY1w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 4/9] qapi/migration: Fix examples document wrong field name for arguments Date: Mon, 28 Feb 2022 12:26:08 +0100 Message-Id: <20220228112613.520040-5-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 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: , Cc: peter.maydell@linaro.org, Fabian Holler Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646048087236100001 Content-Type: text/plain; charset="utf-8" From: Fabian Holler The examples for the snapshot-* and calc-dirty-rate commands document that arguments for the commands are passed in a 'data' field. This is wrong, passing them in a "data" field results in the error: {"error": {"class": "GenericError", "desc": "QMP input member 'data' is unexpected"}} Arguments are expected to be passed in an field called "arguments". Replace "data" with "arguments" in the snapshot-* and calc-dirty-rate command examples. Signed-off-by: Fabian Holler Message-Id: <20220222170116.63105-1-fabian.holler@simplesurance.de> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/migration.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qapi/migration.json b/qapi/migration.json index 5975a0e104..18e2610e88 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1843,8 +1843,8 @@ # Since: 5.2 # # Example: -# {"command": "calc-dirty-rate", "data": {"calc-time": 1, -# 'sample-pages': 512} } +# {"command": "calc-dirty-rate", "arguments": {"calc-time": 1, +# 'sample-pages': 512} } # ## { 'command': 'calc-dirty-rate', 'data': {'calc-time': 'int64', @@ -1888,7 +1888,7 @@ # Example: # # -> { "execute": "snapshot-save", -# "data": { +# "arguments": { # "job-id": "snapsave0", # "tag": "my-snap", # "vmstate": "disk0", @@ -1949,7 +1949,7 @@ # Example: # # -> { "execute": "snapshot-load", -# "data": { +# "arguments": { # "job-id": "snapload0", # "tag": "my-snap", # "vmstate": "disk0", @@ -2002,7 +2002,7 @@ # Example: # # -> { "execute": "snapshot-delete", -# "data": { +# "arguments": { # "job-id": "snapdelete0", # "tag": "my-snap", # "devices": ["disk0", "disk1"] --=20 2.35.1 From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646048373; cv=none; d=zohomail.com; s=zohoarc; b=iyMR5Otetq9JYTkRjl8Tn4NYBrDSJOm3m47TrfOFZ7HlDUHK89UyoCpRQePZ0OCxND5xmO5eKKM5rOc8q1H1byG2skYPAjnlGuwTaXK6/lSVg0pgJxj7RIdeu1KY+RStcTlRKImFZDYZE1bLMYyTo5yKCQiLCtZZ/Wyl8VNGcvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646048373; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wZgvseUMY2ncLr03zcIwzZc5vE1TTgn8IXYBQV0Kly4=; b=mHsUr4tOCuDXsqev+X+uo5Of68Cpj1tMMU5uXR6GApTYX5vhfKoXF//mPRXu4o7N2sh02cqKLvsRceUG2DRwd/XvWVYwJkodTS94OO8RRAhNwGX+maYBee6YiHwcOWeiNLIED/eD8m8FbvpeawpUgmFU1Uxles+tp1SpGd9mTJM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646048373395981.423332451875; Mon, 28 Feb 2022 03:39:33 -0800 (PST) Received: from localhost ([::1]:59384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeNH-00018K-Vd for importer@patchew.org; Mon, 28 Feb 2022 06:39:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAg-00047S-TI for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32391) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAc-00078v-1o for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-384-shEG5upuPuq0JlOCtmxHNQ-1; Mon, 28 Feb 2022 06:26:18 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A253520F; Mon, 28 Feb 2022 11:26:17 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CFE1D4E2A6; Mon, 28 Feb 2022 11:26:16 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CF26F21E691B; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wZgvseUMY2ncLr03zcIwzZc5vE1TTgn8IXYBQV0Kly4=; b=TegrRXnxaosIOAAylLrhE3ww4c29h31Lsy8qFrwd8LaGMm3pz+DDAdQQTD/o7RcpBlvpX5 fDVutv5X13dBF38BLfAjjs+OcqThyfout42QZ+qerV8EwDk3oxBLEM0nW/d5GBMdU+VtHn Qm0sx00XFkMLAfCGqdgYkt3bK/GG2ew= X-MC-Unique: shEG5upuPuq0JlOCtmxHNQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 5/9] qapi: Move RTC_CHANGE back out of target schema Date: Mon, 28 Feb 2022 12:26:09 +0100 Message-Id: <20220228112613.520040-6-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org, Greg Kurz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646048375320100001 From: Peter Maydell This commit effectively reverts commit 183e4281a30962, which moved the RTC_CHANGE event to the target schema. That change was an attempt to make the event target-specific to improve introspection, but the event isn't really target-specific: it's machine or device specific. Putting RTC_CHANGE in the target schema with an ifdef list reduces maintainability (by adding an if: list with a long list of targets that needs to be manually updated as architectures are added or removed or as new devices gain the RTC_CHANGE functionality) and increases compile time (by preventing RTC devices which emit the event from being "compile once" rather than "compile once per target", because qapi-events-misc-target.h uses TARGET_* ifdefs, which are poisoned in "compile once" files.) Move RTC_CHANGE back to misc.json. Signed-off-by: Peter Maydell Reviewed-by: Markus Armbruster Acked-by: Greg Kurz Message-Id: <20220221192123.749970-2-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- qapi/misc-target.json | 33 --------------------------------- qapi/misc.json | 22 ++++++++++++++++++++++ hw/ppc/spapr_rtc.c | 2 +- hw/rtc/mc146818rtc.c | 2 +- hw/rtc/pl031.c | 2 +- 5 files changed, 25 insertions(+), 36 deletions(-) diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 4bc45d2474..036c5e4a91 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -2,39 +2,6 @@ # vim: filetype=3Dpython # =20 -## -# @RTC_CHANGE: -# -# Emitted when the guest changes the RTC time. -# -# @offset: offset between base RTC clock (as specified by -rtc base), and -# new RTC clock value -# -# Note: This event is rate-limited. -# -# Since: 0.13 -# -# Example: -# -# <- { "event": "RTC_CHANGE", -# "data": { "offset": 78 }, -# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } } -# -## -{ 'event': 'RTC_CHANGE', - 'data': { 'offset': 'int' }, - 'if': { 'any': [ 'TARGET_ALPHA', - 'TARGET_ARM', - 'TARGET_HPPA', - 'TARGET_I386', - 'TARGET_MIPS', - 'TARGET_MIPS64', - 'TARGET_PPC', - 'TARGET_PPC64', - 'TARGET_S390X', - 'TARGET_SH4', - 'TARGET_SPARC' ] } } - ## # @rtc-reset-reinjection: # diff --git a/qapi/misc.json b/qapi/misc.json index e8054f415b..7a70eaa3ff 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -527,3 +527,25 @@ 'data': { '*option': 'str' }, 'returns': ['CommandLineOptionInfo'], 'allow-preconfig': true } + +## +# @RTC_CHANGE: +# +# Emitted when the guest changes the RTC time. +# +# @offset: offset between base RTC clock (as specified by -rtc base), and +# new RTC clock value +# +# Note: This event is rate-limited. +# +# Since: 0.13 +# +# Example: +# +# <- { "event": "RTC_CHANGE", +# "data": { "offset": 78 }, +# "timestamp": { "seconds": 1267020223, "microseconds": 435656 } } +# +## +{ 'event': 'RTC_CHANGE', + 'data': { 'offset': 'int' } } diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 94a5510e4e..79677cf550 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -32,7 +32,7 @@ #include "hw/ppc/spapr.h" #include "migration/vmstate.h" #include "qapi/error.h" -#include "qapi/qapi-events-misc-target.h" +#include "qapi/qapi-events-misc.h" #include "qemu/cutils.h" #include "qemu/module.h" =20 diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index e61a0cced4..57c514e15c 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -40,7 +40,7 @@ #include "hw/rtc/mc146818rtc_regs.h" #include "migration/vmstate.h" #include "qapi/error.h" -#include "qapi/qapi-events-misc-target.h" +#include "qapi/qapi-events-misc.h" #include "qapi/visitor.h" #include "hw/rtc/mc146818rtc_regs.h" =20 diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index 38d9d3c2f3..60167c778f 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -24,7 +24,7 @@ #include "qemu/log.h" #include "qemu/module.h" #include "trace.h" -#include "qapi/qapi-events-misc-target.h" +#include "qapi/qapi-events-misc.h" =20 #define RTC_DR 0x00 /* Data read register */ #define RTC_MR 0x04 /* Match register */ --=20 2.35.1 From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646048070; cv=none; d=zohomail.com; s=zohoarc; b=hHiGSb/jmkAq4BxpWHrVJf+KfEhgFi4LmqgJXbcyR1xXV2dHNkoXDZelKepVNtVJrBGa3hrEoos/fOsdqzeb/awnIhMBjkYZ3CGEOwhvZ/yII7UBvUDC/LDAWAKlUvYUG1bfXDQtHCAVWs/yu8fyvhGxA6fZXdoG+yQ5crR4ofg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646048070; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=psz23OrkzxiAg3EB6X3YAJh0pdGPcSRLBO/K5ZteKqo=; b=V81EQOc0lBok2H1j+IHGVe/Q/KbnddFm9+o964m56Sdpj+k1RXrlJMy6uffOmg6hsszX576oPiA1kxCWoXjlVnLMjgk7OLEiJ+FxaZudgB/QmBpt4H+HsK7ycw+g3mhQ+Nhc0ZQAfXgXbJDP3Ymoe/s6lLvkxo7jI/AYH6nwQmo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646048070248555.0241586937217; Mon, 28 Feb 2022 03:34:30 -0800 (PST) Received: from localhost ([::1]:52260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeIP-0004VA-6o for importer@patchew.org; Mon, 28 Feb 2022 06:34:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAe-00046u-5N for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28322) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAc-00078Z-0g for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-614-_tp0FujbP5qWUBj-I5sbdQ-1; Mon, 28 Feb 2022 06:26:18 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6221B180FD71; Mon, 28 Feb 2022 11:26:17 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 342084E2C7; Mon, 28 Feb 2022 11:26:17 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D14CB21E691D; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=psz23OrkzxiAg3EB6X3YAJh0pdGPcSRLBO/K5ZteKqo=; b=hbEPVIydoeXlo2naLk/afPNner6vxWtTSTtrPlLr7eNVqiTTVowuUZPZCllV0rmXXlgTUO aYgEVso//Pu7EZ86NL25FndBXDU5qXlR9SZaAf2ROFbGdg4n7+AFJOMmolJ7342Os1ZSwl aIjKP0WmhOX3uShPg+1lMyn+8qtSlNg= X-MC-Unique: _tp0FujbP5qWUBj-I5sbdQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 6/9] qapi: Document some missing details of RTC_CHANGE event Date: Mon, 28 Feb 2022 12:26:10 +0100 Message-Id: <20220228112613.520040-7-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646048071200100001 From: Peter Maydell The RTC_CHANGE event's documentation is missing some details: * the offset argument is in units of seconds * it isn't guaranteed that the RTC will implement the event Signed-off-by: Peter Maydell Message-Id: <20220221192123.749970-3-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- qapi/misc.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qapi/misc.json b/qapi/misc.json index 7a70eaa3ff..0ab235e41f 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -533,10 +533,12 @@ # # Emitted when the guest changes the RTC time. # -# @offset: offset between base RTC clock (as specified by -rtc base), and -# new RTC clock value +# @offset: offset in seconds between base RTC clock (as specified +# by -rtc base), and new RTC clock value # # Note: This event is rate-limited. +# It is not guaranteed that the RTC in the system implements +# this event, or even that the system has an RTC at all. # # Since: 0.13 # --=20 2.35.1 From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646047773; cv=none; d=zohomail.com; s=zohoarc; b=dgI8PyWdwvQbKEc0sZ216EC9/yrRB0uFs1wuXCudkr52+NOtYbDt1JkIuPA7r0zyEkGzlTGlUFsUeaSZ46CyT9wNbmIeK3PWZ/LlXA31sY0aZCzlKgou61xftMluJr33PvgQcg8N9w3ivQssc98XxGDq9BWyBR4Ch6hnNlB77PM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646047773; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u+KdPj4nunu7sAqKxdo+/X7MP94GLUYj9/RHqP/oWvw=; b=PDiAdS5JlX4F3LW48a4QVf/8yryPwyZV04zOPIlDD8umMpz6TXLT8j2ttnQ6+grnELy7j/o2HjwwSv/F89hAkc2Hd8EeWpwWuAP1RASypayf3SNKCiMhM3C8Q468qKVs/jVBl4ZFZIst/gkj5v4kvVRm23OogdQzk5WeD3Pn9vI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646047773698641.4062663348833; Mon, 28 Feb 2022 03:29:33 -0800 (PST) Received: from localhost ([::1]:43662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeDc-0006wc-GQ for importer@patchew.org; Mon, 28 Feb 2022 06:29:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAc-000469-B6 for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAX-00077k-M9 for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-562-vjC3JttvOay1oGa6B31YMg-1; Mon, 28 Feb 2022 06:26:18 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2675F824FA7; Mon, 28 Feb 2022 11:26:17 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D04DD2B3DC; Mon, 28 Feb 2022 11:26:16 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D36FC21E691F; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u+KdPj4nunu7sAqKxdo+/X7MP94GLUYj9/RHqP/oWvw=; b=SBVOpq80KYjaOyntXTljaQ2LU8ezV7HpczZOnHyB6gKi1MWV02+KA8lf6kooRsEWV+DQuL 7wiqCL1QCDo/FAoXlkV+EcF1HwPpLsC17suxlFBMqG7JXGGziAiCt8LxKC1KrwabwEv3j2 uRO9ub7tkcXHEsdWNeaAjtYCO66S5ME= X-MC-Unique: vjC3JttvOay1oGa6B31YMg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 7/9] hw/rtc: Compile pl031 once-only Date: Mon, 28 Feb 2022 12:26:11 +0100 Message-Id: <20220228112613.520040-8-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646047775167100001 From: Peter Maydell Now that the RTC_CHANGE event is no longer target-specific, we can move the pl031 back to a compile-once source file rather than a compile-per-target one. Signed-off-by: Peter Maydell Message-Id: <20220221192123.749970-4-peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Markus Armbruster --- hw/rtc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build index 8fd8d8f9a7..7cecdee5dd 100644 --- a/hw/rtc/meson.build +++ b/hw/rtc/meson.build @@ -2,7 +2,7 @@ softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c')) softmmu_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c')) softmmu_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c')) -specific_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c')) +softmmu_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c')) softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c')) softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true: files('= m48t59-isa.c')) softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc= .c')) --=20 2.35.1 From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646048221; cv=none; d=zohomail.com; s=zohoarc; b=HCQJAyB6eYSuEnB4MFrmS2ER9jCKKBAZxdRJUr5mkPlx7Fc1sevOEn8z1er0mvl9V8Tsym9/CWBKvr/NorZRb07Y2H7ftmxVaW8J29W53cmJ2MIEYYCT4a1hjv8p0ESxV34Pfjl97gRuGaIf6RqkIP25A7Qr8lODZjfEcJBiedc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646048221; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mpcdpfKhZczd8z4YZ1dFbkWmNjzpKP/HLChZjwNTQYU=; b=mcZAq4qX7QDOiGALDZHWuOeb+Lmko6xmQlI3W4YnJOwvlPiSQwIqh7rIMRv2jHC5eVng9vZVtFKT+TG1jrXFW0EvDQRbPoca3+1ukaRLFPx/AosPrh7ckg/6MHixK+Cd4sYh1BHzOzqXY26m2CDMMZEdBEURMvhjW64Av4UXqJI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646048221724352.96145607394317; Mon, 28 Feb 2022 03:37:01 -0800 (PST) Received: from localhost ([::1]:56682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeKr-0007db-4T for importer@patchew.org; Mon, 28 Feb 2022 06:37:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAe-00046v-8i for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:25800) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAY-00078J-70 for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-487-YsBZSFaPM6StXZOht-B9kQ-1; Mon, 28 Feb 2022 06:26:18 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26509520E; Mon, 28 Feb 2022 11:26:17 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CFCF776BF8; Mon, 28 Feb 2022 11:26:16 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D55C221E6921; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mpcdpfKhZczd8z4YZ1dFbkWmNjzpKP/HLChZjwNTQYU=; b=QLk7TRqeP2AygXYV9t3doLb/mRp7mVpiTZqJZC4BJsL7pNvpHgVM0pGqewdRsFMEho+jFp 94vTkVgqiU9c0yHdSiPZBiwT1l2BLfhJ2cXHYfUbZsKqokaw6ZbE6Eeq7Fl8CHKclRTXR8 5ZRX/JSclrIekPSMDgOU9nQS1Kf23EA= X-MC-Unique: YsBZSFaPM6StXZOht-B9kQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 8/9] rtc: Have event RTC_CHANGE identify the RTC by QOM path Date: Mon, 28 Feb 2022 12:26:12 +0100 Message-Id: <20220228112613.520040-9-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646048224287100001 Event RTC_CHANGE is "emitted when the guest changes the RTC time" (and the RTC supports the event). What if there's more than one RTC? Which one changed? New @qom-path identifies it. Signed-off-by: Markus Armbruster Message-Id: <87a6ejnm80.fsf@pond.sub.org> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qapi/misc.json | 4 +++- hw/ppc/spapr_rtc.c | 4 +++- hw/rtc/mc146818rtc.c | 3 ++- hw/rtc/pl031.c | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/qapi/misc.json b/qapi/misc.json index 0ab235e41f..b83cc39029 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -536,6 +536,8 @@ # @offset: offset in seconds between base RTC clock (as specified # by -rtc base), and new RTC clock value # +# @qom-path: path to the RTC object in the QOM tree +# # Note: This event is rate-limited. # It is not guaranteed that the RTC in the system implements # this event, or even that the system has an RTC at all. @@ -550,4 +552,4 @@ # ## { 'event': 'RTC_CHANGE', - 'data': { 'offset': 'int' } } + 'data': { 'offset': 'int', 'qom-path': 'str' } } diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c index 79677cf550..d55b4b0c50 100644 --- a/hw/ppc/spapr_rtc.c +++ b/hw/ppc/spapr_rtc.c @@ -97,6 +97,7 @@ static void rtas_set_time_of_day(PowerPCCPU *cpu, SpaprMa= chineState *spapr, uint32_t nret, target_ulong rets) { SpaprRtcState *rtc =3D &spapr->rtc; + g_autofree const char *qom_path =3D NULL; struct tm tm; time_t new_s; int64_t host_ns; @@ -120,7 +121,8 @@ static void rtas_set_time_of_day(PowerPCCPU *cpu, Spapr= MachineState *spapr, } =20 /* Generate a monitor event for the change */ - qapi_event_send_rtc_change(qemu_timedate_diff(&tm)); + qom_path =3D object_get_canonical_path(OBJECT(rtc)); + qapi_event_send_rtc_change(qemu_timedate_diff(&tm), qom_path); =20 host_ns =3D qemu_clock_get_ns(rtc_clock); =20 diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 57c514e15c..ac9a60c90e 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -611,12 +611,13 @@ static void rtc_get_time(RTCState *s, struct tm *tm) static void rtc_set_time(RTCState *s) { struct tm tm; + g_autofree const char *qom_path =3D object_get_canonical_path(OBJECT(s= )); =20 rtc_get_time(s, &tm); s->base_rtc =3D mktimegm(&tm); s->last_update =3D qemu_clock_get_ns(rtc_clock); =20 - qapi_event_send_rtc_change(qemu_timedate_diff(&tm)); + qapi_event_send_rtc_change(qemu_timedate_diff(&tm), qom_path); } =20 static void rtc_set_cmos(RTCState *s, const struct tm *tm) diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index 60167c778f..b01d0e75d1 100644 --- a/hw/rtc/pl031.c +++ b/hw/rtc/pl031.c @@ -138,12 +138,13 @@ static void pl031_write(void * opaque, hwaddr offset, =20 switch (offset) { case RTC_LR: { + g_autofree const char *qom_path =3D object_get_canonical_path(opaq= ue); struct tm tm; =20 s->tick_offset +=3D value - pl031_get_count(s); =20 qemu_get_timedate(&tm, s->tick_offset); - qapi_event_send_rtc_change(qemu_timedate_diff(&tm)); + qapi_event_send_rtc_change(qemu_timedate_diff(&tm), qom_path); =20 pl031_set_alarm(s); break; --=20 2.35.1 From nobody Sun Feb 8 23:32:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1646047830; cv=none; d=zohomail.com; s=zohoarc; b=SpPRBb8irc+H7hldkwze7/3rrOCEPZTkUHRy5Ef5Qu/NX1GWGYGKKdSqJaiPZIeOHWkcYaneZ3YGbxE7HpPYj+gvcr9NZ08d1F8wGOQfUQcbHW0wB87l6wG2CF0QqlvKywnvT6hhDhdpZbCZiSRPkF3XYApa+5rdSwxP9W0sAeU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646047830; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=txFEFDX1imOtY/J6Fvf1npDuhL9c7oV3TksvrD+8ljQ=; b=hIMFXHz2Fml34eadvji1rbZbsrziKwGN5dbKReqi+HWaQ2Mkd5x8g4dcWSOrI2OqugSWWomgrSFwpEzatk6WeVxJF2qP9zE/AJfNp6Fh4ziIxBEQw5arglu1z83U0qNhq/SzbDaOo/Yf60V2glGp3eMIYnbGPUHEXfAahjSu3W4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646047830365921.7155930954825; Mon, 28 Feb 2022 03:30:30 -0800 (PST) Received: from localhost ([::1]:44214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nOeEW-0007Ia-Ui for importer@patchew.org; Mon, 28 Feb 2022 06:30:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAg-00047R-SG for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nOeAc-000792-5m for qemu-devel@nongnu.org; Mon, 28 Feb 2022 06:26:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-618-8V7BkrdiMrCm3yBE0jot2w-1; Mon, 28 Feb 2022 06:26:24 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 29D861006AA6; Mon, 28 Feb 2022 11:26:23 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.36.112.3]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D64382B3DE; Mon, 28 Feb 2022 11:26:16 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D743D21E6923; Mon, 28 Feb 2022 12:26:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646047585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=txFEFDX1imOtY/J6Fvf1npDuhL9c7oV3TksvrD+8ljQ=; b=ManvaluwWJPL2FL+TdOWJsj5fhxTRYQXN+7oRftZZ6jzsl5OSU16ZQMJ7fnzgb/xkmXP0o x1FoCQK5refmGne3HdWx4EGKqzOiBArMy1txvWh5aQm+/dO9vLanFDO/pdR2LeUdetgqfj 5u7OEGyzu01eMq9AqQtwb2KsZqslkoA= X-MC-Unique: 8V7BkrdiMrCm3yBE0jot2w-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 9/9] qapi: Belatedly adjust limitations documentation Date: Mon, 28 Feb 2022 12:26:13 +0100 Message-Id: <20220228112613.520040-10-armbru@redhat.com> In-Reply-To: <20220228112613.520040-1-armbru@redhat.com> References: <20220228112613.520040-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , Cc: peter.maydell@linaro.org, Eric Blake , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646047831484100001 Commit 57df0dff1a "qapi: Extend -compat to set policy for unstable interfaces" (v6.2.0) took care of covering experimental features, but neglected to adjust a comment suggesting to cover it. Adjust it now. Fixes: 57df0dff1a1f4c846aa74a082bfd595a8a990015 Signed-off-by: Markus Armbruster Message-Id: <20220225084538.218876-1-armbru@redhat.com> Reviewed-by: Eric Blake Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qapi/compat.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qapi/compat.json b/qapi/compat.json index c53b69fe3f..39b52872d5 100644 --- a/qapi/compat.json +++ b/qapi/compat.json @@ -41,7 +41,7 @@ # # Limitation: covers only syntactic aspects of QMP, i.e. stuff tagged # with feature 'deprecated'. We may want to extend it to cover -# semantic aspects, CLI, and experimental features. +# semantic aspects and CLI. # # Limitation: deprecated-output policy @hide is not implemented for # enumeration values. They behave the same as with policy @accept. --=20 2.35.1