From patchwork Mon Feb 21 19:21:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 544439 Delivered-To: patch@linaro.org Received: by 2002:ac0:e142:0:0:0:0:0 with SMTP id r2csp3483781imn; Mon, 21 Feb 2022 11:33:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJymIzWtJCF3aQBJDxSmyrAHWNIRlrjN0vAb5qAaMdIM3w2VLPoLEDJSoYOstuIDf/o6bw1p X-Received: by 2002:a37:c406:0:b0:648:e9c0:d883 with SMTP id d6-20020a37c406000000b00648e9c0d883mr3341738qki.449.1645471990496; Mon, 21 Feb 2022 11:33:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645471990; cv=none; d=google.com; s=arc-20160816; b=t24PaArdDNWnsY5DP5QXju7gVYhd4YV1P5suZleSmcfY40GNsKDcA0p9Etz+J+3S+K VTvyQGevhM26qOoPIHJJsdE6ftMrydYVPpqX7JCd1lc7/nHrr4QimABapQPMBqmojw4l mbLRz9gRgqLEtbmFArK45EFHhM/dEySgUsNoE+W5wWP3adP2fJncD724Zh+epN1GmgoB hHOfNBnj/qoQJ7osYbuN6KruiWrG5KcVKuwd87H+orDAZ3K3fXAsYdIPE0POtQKySOxx Y4PhbrfsYt3fGMMckpMIXOuTyyOWwihkIwx4uAvc9cXmsEDBoRHaCjGySnp62AKZFJmX VKaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=Jqn0Eq5OamN94rTvkdU2cs5J2LDtszOeBtkgps6SOt0=; b=r6sxrSd/JSoSJ5TmYDzDAFJ8bq6QXt+Ef5JmBqNeQjNHJq0/cNRcMgKXwfYsozhoru X7AIrxR7eLo33eQswsAIJMlJO3lDji0NTfOvaC/Z1ADkJVuDirFdhvj9BGvePIK4P3cW I719Y0Akj4JsnBjaMnL9Ov2dVJIkpD5YHWjqrJzs7KXbcLeUmVNxky7j9eQJdK6hlCsA b6VSQLEDQXCcAoNaoYG/wftS8qU3x1g1zllcZ6V3R+7W56u2veY/VSNmUlX2pn6/WRbH pC0b5Bv9rX48DmUfQQ2Nv3htcDK2mmII7CdaER2juIJDIvR1ET5sKeXFs9hYg4Z0dsle mJWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nst600r9; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z27si11582992qva.264.2022.02.21.11.33.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Feb 2022 11:33:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nst600r9; 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 Received: from localhost ([::1]:37226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMEQo-0006i2-25 for patch@linaro.org; Mon, 21 Feb 2022 14:33:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMEFo-0007j5-Cp for qemu-devel@nongnu.org; Mon, 21 Feb 2022 14:21:48 -0500 Received: from [2a00:1450:4864:20::335] (port=39673 helo=mail-wm1-x335.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMEFi-0002dM-4L for qemu-devel@nongnu.org; Mon, 21 Feb 2022 14:21:47 -0500 Received: by mail-wm1-x335.google.com with SMTP id j9-20020a05600c190900b0037bff8a24ebso53800wmq.4 for ; Mon, 21 Feb 2022 11:21:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jqn0Eq5OamN94rTvkdU2cs5J2LDtszOeBtkgps6SOt0=; b=nst600r9RjZ4URbxu2yxmyWpDU18SN1XtJKR7g1fOeDy/l2dYTazCwCShARi5G5e8u CaauuwcTYtc+WBf1TIBRNitgIGIsU7Mu3AmzVsdydouAADB54fTwO92cNVxCg7Ktt8ee Bk8lW4smPw3UZeg96qV6r4fA+HMP3PWky4A1n0ubjtnGgR0GAeUyWXW2LVBcJnd0bWBb ZhU9IydmqwA+Sw413oVdAgq+7uGerjMwfxnnbYlKjHlXpjfC/1EmQ17xvoNz2OX68su2 qv56v9Ij0mCmhYrnYdcyHBWpROwLKwvm4EOSqAMO/GtjAlw4BpSa4FHwb74ET63VVpNX 5yDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jqn0Eq5OamN94rTvkdU2cs5J2LDtszOeBtkgps6SOt0=; b=zNj5rTpu2wKxEKoGBv8CnX8X35GlW4ZVQoNbNR70x+Mxf6X0TfMt/6DP3QXIzL21Zj P7wStB4rlz9wU7uZTLtNG0XQfmv35dwN62PPs/rWeDUxBFx10GsQ4RZB2gSIQJAsj3ci VcdnGCoeuW8VUVWZF67yVUbnTSj59h4cp9rl/eX8h8U7YvND88FO/1rnetOdTuz9B7vX N2qmX3ni2x6Fk0IWSW0tfiocX+I/P+dsfqfXBnYBBYWROUzejzVK0Pg5SFDiIpRxJ+ep dd6cHVcuvR9d+HT4EqkfoUDbut2YHnBSd3gQ2FAZObbC6j+ME1kLnIqPb146HO3BoPqw u6vQ== X-Gm-Message-State: AOAM531c3iKrmhg5S0K33MrzUcfQqvrwRGwEu6mTITvOWb2hbKl3y0ch 2QOzKDCVuhyzBibQ1jP3bez/hA== X-Received: by 2002:a7b:c8c2:0:b0:37b:b742:a9de with SMTP id f2-20020a7bc8c2000000b0037bb742a9demr386010wml.37.1645471286546; Mon, 21 Feb 2022 11:21:26 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j6sm38958226wrt.70.2022.02.21.11.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 11:21:26 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 1/3] qapi: Move RTC_CHANGE back out of target schema Date: Mon, 21 Feb 2022 19:21:21 +0000 Message-Id: <20220221192123.749970-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220221192123.749970-1-peter.maydell@linaro.org> References: <20220221192123.749970-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::335 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: Eric Blake , Markus Armbruster Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé --- 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 4bc45d24741..036c5e4a914 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -2,39 +2,6 @@ # vim: filetype=python # -## -# @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 e8054f415b2..7a70eaa3ffc 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 94a5510e4eb..79677cf5503 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" diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index e61a0cced4c..57c514e15c5 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" diff --git a/hw/rtc/pl031.c b/hw/rtc/pl031.c index 38d9d3c2f38..60167c778f2 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" #define RTC_DR 0x00 /* Data read register */ #define RTC_MR 0x04 /* Match register */ From patchwork Mon Feb 21 19:21:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 544437 Delivered-To: patch@linaro.org Received: by 2002:ac0:e142:0:0:0:0:0 with SMTP id r2csp3478787imn; Mon, 21 Feb 2022 11:23:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvRRl/fQu5Dx2hdCzrRd5s/fjhRBuF9cnqIXI2ARgHHt7RcLyLDkI1dtVT9zDZidXbLv1j X-Received: by 2002:a37:2c03:0:b0:62c:defe:816b with SMTP id s3-20020a372c03000000b0062cdefe816bmr9900208qkh.704.1645471430460; Mon, 21 Feb 2022 11:23:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645471430; cv=none; d=google.com; s=arc-20160816; b=xnDhftBp4U83PjQWYrURSAHEUtamLR8fw40xxB+Glox4S6hmrTc7Jwh0Ru0uFtsKja Fi0yLkPttAMRqjA/QB5KuTfH9vtY9Vac4ebgG8DtZN74dfUDbtpiXmfjA6WJXfhowfb3 +rSevtwEgScO3EsFbnQWwUSTFihSXjD5QiyTjQn92BquPbaplIWOXaeB9qKI7+P9zvCw RpPXlJXPIvUoKBB7foBxoo90ASXyXd0+bP8pbdLF4rVLnaly1F6JWBz8R9LLVwI2y8mR bTSzg/i720d8brCjiPjQTzROhB+RAqCcT25bp7EW7vta2WmgIYUPqOQF7dVp8h4IjzxA Tqxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=8LxaYHsGrP1n2gu8fs/oq2UgPzeDfx1gMnABjk6F6VA=; b=YWHxxKEhFZKjBQIbau0IGfF8PRFEGtfKH+VnhZ/ChQ30KoMg4Og+Af8pBtVAj2FrRp rCSE7QpN9/OtriInxxrhx4m8W7Fw2thRKB2skTb1+kXRwTfemRXJo4rA5l+c7BgsixV+ puEbfL9mhD1AMxMM1mDB+RFOkLmSZ4zT5xK/umMWjBtlQMkI8QyjyMJEjzORWt931PSw nfFluS8mDDNSdwSEgan9NNL+uf8mzgKhV18w+iQhzrzlc5ccI4ygOqr87zfVghUDRVOp Pqpn6MsOod2Z66t9OjCTJ6q+ipDvHWjI859GK9ax+f6IrF1LMq4V27fCsGPzZUhcY5Lp gxRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pHj45sD9; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v5si761286qkp.17.2022.02.21.11.23.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Feb 2022 11:23:50 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pHj45sD9; 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 Received: from localhost ([::1]:54924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMEHm-0007pi-0q for patch@linaro.org; Mon, 21 Feb 2022 14:23:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMEFn-0007hs-Ta for qemu-devel@nongnu.org; Mon, 21 Feb 2022 14:21:47 -0500 Received: from [2a00:1450:4864:20::434] (port=46914 helo=mail-wr1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMEFi-0002dV-D8 for qemu-devel@nongnu.org; Mon, 21 Feb 2022 14:21:47 -0500 Received: by mail-wr1-x434.google.com with SMTP id j22so2706407wrb.13 for ; Mon, 21 Feb 2022 11:21:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8LxaYHsGrP1n2gu8fs/oq2UgPzeDfx1gMnABjk6F6VA=; b=pHj45sD9BdDX+F8PmIuOVjwWItzcDJ8z1k0UjUrQlfyau25fDmU5KaXu59FsJ+ISK2 V8LX1NG3ceuyFmW0DGHsWjkIHmZ/F8YiXuAAWPdzwTBR31szOXiJQxE/aDnl+bbEYhLS NL5QXtzcDtwPgiqiXUttaHzm9cH0GtwQVf7ebS3rCuSu93gnuXHdM0cntQXa3WRaIrh2 D8C9xsriTZaeWdYibV0/toSeOxDRFTePg1XD0STPWfINxIXXu8y+6RsM47rGuKRNe4v6 R+3bGwK6qUcFD/QUD+UAEzTr9g7R+YHeCdNX/fvHfd/XQwzikWAsVCU/Mw8XqyAYirhf 1+yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8LxaYHsGrP1n2gu8fs/oq2UgPzeDfx1gMnABjk6F6VA=; b=KBvIUH7WPJgYENeWPKo10+krqw0H2OBtJsGa7O9qM1c/Y0SI95kMhHJbTXJkJVK03P ZMEepPC5ngo4N2gAkMu0SfmBIF42AnApLOkTSYo0PkaSvdtIg+apAKxbz2oEeuSvNyjV s5pa6wGjd7CQJ3aBTVWdtqrjSpa6qSr6u8F6BYbKG9zJst+PgwhRTflw6cnFlKk5O4cp keyN6v7E35n9toDF457c//krunOLybKnTA/7XahcZjlmvp7D7ksYOFT1J2+3yCAlXcx4 t8hpMdQAf1BX775pG+EwdxjgbV46IAECpvBJjxPgkUq8+EKrA43ShMbnm+Eq+qcXvanC wLig== X-Gm-Message-State: AOAM53310DrIT4kxDkz9pJm12wNpN4L2pB9l+15oC3HliLesMPAjluUu 05XkFJ5oQaf9AArLa72dl3hZc48PWzWSNw== X-Received: by 2002:a5d:6d8c:0:b0:1ea:7d52:c05c with SMTP id l12-20020a5d6d8c000000b001ea7d52c05cmr1510354wrs.663.1645471287507; Mon, 21 Feb 2022 11:21:27 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j6sm38958226wrt.70.2022.02.21.11.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 11:21:27 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 2/3] qapi: Document some missing details of RTC_CHANGE event Date: Mon, 21 Feb 2022 19:21:22 +0000 Message-Id: <20220221192123.749970-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220221192123.749970-1-peter.maydell@linaro.org> References: <20220221192123.749970-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::434 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: Eric Blake , Markus Armbruster Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster --- v1->v2: add the "RTC might not implement this" note --- qapi/misc.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qapi/misc.json b/qapi/misc.json index 7a70eaa3ffc..0ab235e41f7 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 # From patchwork Mon Feb 21 19:21:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 544438 Delivered-To: patch@linaro.org Received: by 2002:ac0:e142:0:0:0:0:0 with SMTP id r2csp3480359imn; Mon, 21 Feb 2022 11:27:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKQ/dL3P7mZlG28UgB1ahja4o4LH+r3Q9IdBizXd1vVsabR3hFNN1CY0fCaRT67Z9DqioV X-Received: by 2002:a37:80b:0:b0:507:58e:5dd4 with SMTP id 11-20020a37080b000000b00507058e5dd4mr13533004qki.130.1645471620961; Mon, 21 Feb 2022 11:27:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645471620; cv=none; d=google.com; s=arc-20160816; b=F7REH9Q2pQP0IbN1bTnR5N+ykkFVVj1VX+r5d/uaG1LJq8tYU5YQ0dK+VfBATVGTo5 klQ6bclVrprl3aJ6czyzAqr+ZOfG2AQA1DYFgKq3Ht99/+ynXw98FAVnDygGDm2esOB2 0k3TRWMcfIBkxcDgUBXIYUKAb/X/BZADXmN5PNycvmB7FFs4yjRQJ7JfVayhYX9Dwje3 4RXWo/6xJU7K5zWX0WldM4E1BxR+CZ3PhjdQ9R+93IpO2+PNc0CBmrxIQrGiIKJ73PFZ Dx+hy3ge8Oek+c1lAvyM9e1VjJs1OE0zr07Q4zvFL7Pjs8uQfz2YoIM+jJRRJCmqRMrb i+2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from :dkim-signature; bh=FYwSuEjvQcSL/9thHK2sjrgtlkbwAqldrJkzTwEeRVg=; b=DPswlnO4awyfzSULSSGjpRrkkGL0zWadSJZRLh7XxLh68tQ2pSQjs3b7zjPagQke/0 mpuZJYWOJe70ZbWW42EkQYpIeOsdRLSaOaG+UHXY1vVdjF7Gsv9Qj7tXj6a7lY22hyd7 R999DmEjgUolHfwvkFzL4DjZFJ9o2nAIt+tn5A0X3scIBrp882TfpkcwrtQcREPrAjeZ 46ZZCsGO4kmRh5ln4npcl7H/kMaRgtnPQ8/4mgzpVf+Tqk2zUvR6f/TvnqfS554tOpGn VUmIBe5G19HfFj6XQRn794bcyKOTJ+Xf0d42QVjut7BUsFkzFtuTAjCDreeXX7YIHJjU hFmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LVbumPSy; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d123si6761461qkf.35.2022.02.21.11.27.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Feb 2022 11:27:00 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LVbumPSy; 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 Received: from localhost ([::1]:58990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMEKq-0002Ao-HH for patch@linaro.org; Mon, 21 Feb 2022 14:27:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMEFo-0007ik-5A for qemu-devel@nongnu.org; Mon, 21 Feb 2022 14:21:48 -0500 Received: from [2a00:1450:4864:20::32b] (port=37774 helo=mail-wm1-x32b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nMEFi-0002de-4Q for qemu-devel@nongnu.org; Mon, 21 Feb 2022 14:21:47 -0500 Received: by mail-wm1-x32b.google.com with SMTP id p14-20020a05600c1d8e00b0037f881182a8so67782wms.2 for ; Mon, 21 Feb 2022 11:21:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FYwSuEjvQcSL/9thHK2sjrgtlkbwAqldrJkzTwEeRVg=; b=LVbumPSyaX7TrpD3kP5p4S/v9/R/teBm5aN9HJCEeQ5n3ogBXzFU0kiXJNokDn7UzU O3x9H3IVqA3jlxR5Tl9DDKJoVrcbQOlWwY5ymX7a9BAkpwRNPvFGJRtjuJlqCyIisxsM zN4VLc+tQL6C2Lb4ktpta4qnmBRFanQ18mKGDm2ayc5CMdkf0TbXUfhoTkWCeV/EGvBR 2VdXB8LpTeqMriKKzhc84dmILW8k0aqJKJM/Isu0QwiyKTxpb+nImGMl+2IwI+zQ9Gce bdFUnzFvnM1pKlPewqCkzAE4CvqJmw7zjByFvjUsgfN1pbZNdHUHJPLJub32sRTaMguQ i0kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FYwSuEjvQcSL/9thHK2sjrgtlkbwAqldrJkzTwEeRVg=; b=6U5qeVkUsvkwAbqkEqHPRtNwp18jpiByFVV8cuY5+CwUW2YMbchv6lcW5GreOlRWMI nWEwYtIiZwrLfNiLS3T3TWc8B2bBzAIPWes57HrJAfxZIKwro3wzwBRbLZsPcNpdoGvH 3+sMjPKg0KaDgB50lBBmhk5V8r3E5y+DpAPc2ss38G3pQYYOLIQOeTbvZI2KpRoVSHkb grdzt+FJm3+jtU/N7QDLzl8860tjsqIu1yWWP3aDsEG9aJ9RgGD0s1gWj+XjgCysCI8u NvXLrEQSg5YZdS5fwp6x/z7Q2vmI/c3ozhwIZAA+MQ2DUTxZa+oU5272S6Qci6+y7ERe zNlQ== X-Gm-Message-State: AOAM5317a3oSjDud/2KO8/KW3kIACE4nhv1URLTNZl9AyHanI1LCrZ/E ibAsj1O58OQH3gKLHi9wCQVDZw== X-Received: by 2002:a1c:2742:0:b0:37b:b481:321f with SMTP id n63-20020a1c2742000000b0037bb481321fmr400745wmn.56.1645471288400; Mon, 21 Feb 2022 11:21:28 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j6sm38958226wrt.70.2022.02.21.11.21.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Feb 2022 11:21:28 -0800 (PST) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH v2 3/3] hw/rtc: Compile pl031 once-only Date: Mon, 21 Feb 2022 19:21:23 +0000 Message-Id: <20220221192123.749970-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220221192123.749970-1-peter.maydell@linaro.org> References: <20220221192123.749970-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: Eric Blake , Markus Armbruster Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Philippe Mathieu-Daudé --- 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 8fd8d8f9a71..7cecdee5ddb 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'))