From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D0F5AC4345F for ; Sat, 27 Apr 2024 07:59:26 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0cxH-0002Gl-Dv; Sat, 27 Apr 2024 03:58:43 -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 1s0cxD-0002GS-KP for qemu-devel@nongnu.org; Sat, 27 Apr 2024 03:58:40 -0400 Received: from forwardcorp1a.mail.yandex.net ([178.154.239.72]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s0cxB-00049G-7h for qemu-devel@nongnu.org; Sat, 27 Apr 2024 03:58:39 -0400 Received: from mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1f:6401:0:640:7e6f:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id 691AE60C64; Sat, 27 Apr 2024 10:58:14 +0300 (MSK) Received: from d-tatianin-lin.yandex-team.ru (unknown [2a02:6b8:b081:b490::1:30]) by mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 8wI4UW0IYiE0-0AY2P5eq; Sat, 27 Apr 2024 10:58:13 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1714204693; bh=vwRqRltFgw7zZDNaSw0Y9HMLTNg35Jgz8gQaiYfSK3k=; h=Message-Id:Date:Cc:Subject:To:From; b=eF+iC5BznNqVygXQn1RlLVzhU9bqGOVXAYPJtkvM2DpHF5BdIQUYIgOGkWOJA7xZB HpOcgPLRcINJKmtxUthwvxGfpQ9p8pwq9zQ9OpB4sdv9RPYt3MvylJmVmHoNBtq88X qD6JFjAFhEHQxJjQksG7IZDzAlD+lleoIo+pBvxQ= Authentication-Results: mail-nwsmtp-smtp-corp-main-69.vla.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Daniil Tatianin To: "Michael S. Tsirkin" Cc: Daniil Tatianin , Paolo Bonzini , Eric Blake , Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH v1] mc146818rtc: add a way to generate RTC interrupts via QMP Date: Sat, 27 Apr 2024 10:58:01 +0300 Message-Id: <20240427075801.491673-1-d-tatianin@yandex-team.ru> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.154.239.72; envelope-from=d-tatianin@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net 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, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This can be used to force-synchronize the time in guest after a long stop-cont pause, which can be useful for serverless-type workload. Also add a comment to highlight the fact that this (and one other QMP command) only works for the MC146818 RTC controller. Signed-off-by: Daniil Tatianin --- Changes since v0: - Rename to rtc-inject-irq to match other similar API - Add a comment to highlight that this only works for the I386 RTC --- hw/rtc/mc146818rtc.c | 20 ++++++++++++++++++++ include/hw/rtc/mc146818rtc.h | 1 + qapi/misc-target.json | 16 ++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index f4c1869232..8501b55cbd 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -107,6 +107,11 @@ static void rtc_coalesced_timer_update(MC146818RtcState *s) static QLIST_HEAD(, MC146818RtcState) rtc_devices = QLIST_HEAD_INITIALIZER(rtc_devices); +/* + * NOTE: + * The two QMP functions below are _only_ implemented for the MC146818. + * All other RTC devices ignore this. + */ void qmp_rtc_reset_reinjection(Error **errp) { MC146818RtcState *s; @@ -116,6 +121,21 @@ void qmp_rtc_reset_reinjection(Error **errp) } } +void qmp_rtc_inject_irq(Error **errp) +{ + MC146818RtcState *s; + + /* + * See: + * https://www.kernel.org/doc/Documentation/virtual/kvm/timekeeping.txt + */ + QLIST_FOREACH(s, &rtc_devices, link) { + s->cmos_data[RTC_REG_B] |= REG_B_UIE; + s->cmos_data[RTC_REG_C] |= REG_C_IRQF | REG_C_UF; + qemu_irq_raise(s->irq); + } +} + static bool rtc_policy_slew_deliver_irq(MC146818RtcState *s) { kvm_reset_irq_delivered(); diff --git a/include/hw/rtc/mc146818rtc.h b/include/hw/rtc/mc146818rtc.h index 97cec0b3e8..6cd9761d80 100644 --- a/include/hw/rtc/mc146818rtc.h +++ b/include/hw/rtc/mc146818rtc.h @@ -56,5 +56,6 @@ MC146818RtcState *mc146818_rtc_init(ISABus *bus, int base_year, void mc146818rtc_set_cmos_data(MC146818RtcState *s, int addr, int val); int mc146818rtc_get_cmos_data(MC146818RtcState *s, int addr); void qmp_rtc_reset_reinjection(Error **errp); +void qmp_rtc_inject_irq(Error **errp); #endif /* HW_RTC_MC146818RTC_H */ diff --git a/qapi/misc-target.json b/qapi/misc-target.json index 4e0a6492a9..d84a5d07a2 100644 --- a/qapi/misc-target.json +++ b/qapi/misc-target.json @@ -19,6 +19,22 @@ { 'command': 'rtc-reset-reinjection', 'if': 'TARGET_I386' } +## +# @rtc-inject-irq: +# +# Inject an RTC interrupt. +# +# Since: 9.1 +# +# Example: +# +# -> { "execute": "rtc-inject-irq" } +# <- { "return": {} } +# +## +{ 'command': 'rtc-inject-irq', + 'if': 'TARGET_I386' } + ## # @SevState: # -- 2.34.1