From nobody Sun Feb 8 05:34:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563969536; cv=none; d=zoho.com; s=zohoarc; b=h0mWi9dQH1JMHvGtHWXY3+JjQAFE/B7pR75tkWkwyRcXLov7On46+nnE3UOwhG9KuandrJsmg4wi0h2lTmv+k8lwAtCBF4OPXkNArk/XPB8HUptLOhEXi3wJbdOyrTnNf4dQbzVCQApxs2TIWjLrbpZWKpEK5UfOXlq13xWokI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563969536; h=Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=pgsbViiK+QIeQpLSACY5KUKud3zFc8ZjrtqJXzyC24E=; b=g6GcaZ2DH+rrdRB/YlnAVI2O3fLTVDOiZ6qcVEdQ/mnramL0JDbVmNnfe4luT8iCqyNejDMpbfgsKV/zhuJ3nfS1l8ysRRX+Zb8ievdFSXdjkZ6aLutcTN7btX65pgLtRtE2Mxlt4BlQAPI3UPcK02sTXj5SIDyq+eChFmDDjOY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563969536126775.4928850254461; Wed, 24 Jul 2019 04:58:56 -0700 (PDT) Received: from localhost ([::1]:50724 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFv4-0006gX-Eo for importer@patchew.org; Wed, 24 Jul 2019 07:58:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36572) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFuf-0005TP-DU for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqFue-0004bf-ED for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40490) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqFue-0004bF-92 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:28 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 856BE307D945; Wed, 24 Jul 2019 11:58:27 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-166.ams2.redhat.com [10.36.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB146600D1; Wed, 24 Jul 2019 11:58:26 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, pavel.dovgaluk@ispras.ru Date: Wed, 24 Jul 2019 12:58:20 +0100 Message-Id: <20190724115823.4199-2-dgilbert@redhat.com> In-Reply-To: <20190724115823.4199-1-dgilbert@redhat.com> References: <20190724115823.4199-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 24 Jul 2019 11:58:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [for 4.2 PATCH v2 1/4] mc146818rtc: Remove reset notifiers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" The reset notifiers are unreliable and recalculating the offsets after boot causes problems with migration in cases where explicit base times are set on the destination. Signed-off-by: Dr. David Alan Gilbert --- hw/timer/mc146818rtc.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index ce4550b6f2..352ff9d395 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -92,7 +92,6 @@ typedef struct RTCState { uint32_t irq_coalesced; uint32_t period; QEMUTimer *coalesced_timer; - Notifier clock_reset_notifier; LostTickPolicy lost_tick_policy; Notifier suspend_notifier; QLIST_ENTRY(RTCState) link; @@ -885,20 +884,6 @@ static const VMStateDescription vmstate_rtc =3D { } }; =20 -static void rtc_notify_clock_reset(Notifier *notifier, void *data) -{ - RTCState *s =3D container_of(notifier, RTCState, clock_reset_notifier); - int64_t now =3D *(int64_t *)data; - - rtc_set_date_from_host(ISA_DEVICE(s)); - periodic_timer_update(s, now, 0); - check_update_timer(s); - - if (s->lost_tick_policy =3D=3D LOST_TICK_POLICY_SLEW) { - rtc_coalesced_timer_update(s); - } -} - /* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE) BIOS will read it and start S3 resume at POST Entry */ static void rtc_notify_suspend(Notifier *notifier, void *data) @@ -984,10 +969,6 @@ static void rtc_realizefn(DeviceState *dev, Error **er= rp) s->update_timer =3D timer_new_ns(rtc_clock, rtc_update_timer, s); check_update_timer(s); =20 - s->clock_reset_notifier.notify =3D rtc_notify_clock_reset; - qemu_clock_register_reset_notifier(rtc_clock, - &s->clock_reset_notifier); - s->suspend_notifier.notify =3D rtc_notify_suspend; qemu_register_suspend_notifier(&s->suspend_notifier); =20 --=20 2.21.0 From nobody Sun Feb 8 05:34:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563969539; cv=none; d=zoho.com; s=zohoarc; b=MUmv/LY/8Hzx6KwegNJP8o0zegyrIwTwtgh0NHGyR0KXY4OB0wSDdXmPKC8wfXEAHBXOOuakKypMsj9qf8QybSHj4QWNOt5RdqvC6arx9pHrB4jye5bYQI8aSZbXxzKq4tM6EiNdpX4paBOO0PHJzcwYCdXQcvwqHugY71y4ePY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563969539; h=Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=3KvFM1FvqBSIKxwE39r03ATXG11d7aKqToM9y0NXAlA=; b=D7tK2BjAmF6Sci7FH1h5QprHkqCbsqAeAyrLhkUQfcwpC3J4+5UFMv7quBHO+HAbQfl4amD6cxtMlrtKb2UGrC9BqylAQcCoPlP0cynm1t0v4wJo169VMe3YZ7Qlr6iTae3FdcJsEkozdcWrDVpD3D/1JMI6mYCqj/5h9lLGfZo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563969539081470.13419789747013; Wed, 24 Jul 2019 04:58:59 -0700 (PDT) Received: from localhost ([::1]:50726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFv7-0006tF-EU for importer@patchew.org; Wed, 24 Jul 2019 07:58:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36587) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFug-0005UG-LA for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqFuf-0004cP-IX for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32782) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqFuf-0004bv-Aw for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:29 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id A85743DE0F; Wed, 24 Jul 2019 11:58:28 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-166.ams2.redhat.com [10.36.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD667600D1; Wed, 24 Jul 2019 11:58:27 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, pavel.dovgaluk@ispras.ru Date: Wed, 24 Jul 2019 12:58:21 +0100 Message-Id: <20190724115823.4199-3-dgilbert@redhat.com> In-Reply-To: <20190724115823.4199-1-dgilbert@redhat.com> References: <20190724115823.4199-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 24 Jul 2019 11:58:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [for 4.2 PATCH v2 2/4] timer: Remove reset notifiers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Remove the reset notifer from the core qemu-timer code. The only user was mc146818 and we've just remove it's use. Signed-off-by: Dr. David Alan Gilbert --- include/qemu/timer.h | 22 ---------------------- util/qemu-timer.c | 21 +-------------------- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 5d978e1634..6817c78ef4 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -227,28 +227,6 @@ void qemu_clock_enable(QEMUClockType type, bool enable= d); */ void qemu_start_warp_timer(void); =20 -/** - * qemu_clock_register_reset_notifier: - * @type: the clock type - * @notifier: the notifier function - * - * Register a notifier function to call when the clock - * concerned is reset. - */ -void qemu_clock_register_reset_notifier(QEMUClockType type, - Notifier *notifier); - -/** - * qemu_clock_unregister_reset_notifier: - * @type: the clock type - * @notifier: the notifier function - * - * Unregister a notifier function to call when the clock - * concerned is reset. - */ -void qemu_clock_unregister_reset_notifier(QEMUClockType type, - Notifier *notifier); - /** * qemu_clock_run_timers: * @type: clock on which to operate diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 1cc1b2f2c3..2faaaf9926 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -48,7 +48,6 @@ typedef struct QEMUClock { /* We rely on BQL to protect the timerlists */ QLIST_HEAD(, QEMUTimerList) timerlists; =20 - NotifierList reset_notifiers; int64_t last; =20 QEMUClockType type; @@ -133,7 +132,6 @@ static void qemu_clock_init(QEMUClockType type, QEMUTim= erListNotifyCB *notify_cb clock->enabled =3D (type =3D=3D QEMU_CLOCK_VIRTUAL ? false : true); clock->last =3D INT64_MIN; QLIST_INIT(&clock->timerlists); - notifier_list_init(&clock->reset_notifiers); main_loop_tlg.tl[type] =3D timerlist_new(type, notify_cb, NULL); } =20 @@ -630,7 +628,7 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *= tlg) =20 int64_t qemu_clock_get_ns(QEMUClockType type) { - int64_t now, last; + int64_t now; QEMUClock *clock =3D qemu_clock_ptr(type); =20 switch (type) { @@ -645,11 +643,7 @@ int64_t qemu_clock_get_ns(QEMUClockType type) } case QEMU_CLOCK_HOST: now =3D REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime()); - last =3D clock->last; clock->last =3D now; - if (now < last || now > (last + get_max_clock_jump())) { - notifier_list_notify(&clock->reset_notifiers, &now); - } return now; case QEMU_CLOCK_VIRTUAL_RT: return REPLAY_CLOCK(REPLAY_CLOCK_VIRTUAL_RT, cpu_get_clock()); @@ -668,19 +662,6 @@ void qemu_clock_set_last(QEMUClockType type, uint64_t = last) clock->last =3D last; } =20 -void qemu_clock_register_reset_notifier(QEMUClockType type, - Notifier *notifier) -{ - QEMUClock *clock =3D qemu_clock_ptr(type); - notifier_list_add(&clock->reset_notifiers, notifier); -} - -void qemu_clock_unregister_reset_notifier(QEMUClockType type, - Notifier *notifier) -{ - notifier_remove(notifier); -} - void init_clocks(QEMUTimerListNotifyCB *notify_cb) { QEMUClockType type; --=20 2.21.0 From nobody Sun Feb 8 05:34:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563969569; cv=none; d=zoho.com; s=zohoarc; b=UADg3vVskC+81wNS/c0h7DLP2kZ32psJcuhYMRDJC1K5+hFYFauPfIVKa5bl+HNNp6vwa2FEXM0MtyEBYz4DRwpZPHF4wg/YlvaBAtrx9Z6t/dp4VcofhOLh26Myj+6uOZYwi1fSOGNoOLkCpDaJTAdichfgzIQS8O5EV1cswGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563969569; h=Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=8H/vPl8xHxZrCjnzvD6ELHPT0V7TMVid53NdKTt9vzI=; b=PMF8JqwJcPmTv1FGdi7Odr0DL7D4ieL95t7fxDxmnr1ZyOkacrtA65p9w/P2MS0Fy9LkzNFZIW97/P06YxUsS/H8OfkIZbFE/xTa7beXHFzO84e7R00H0iSmM9GLjL2Is13pRdJ7q94PhBUwXkDLjjTVW8WrDeh9SnP3Z2caJlk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563969569546515.7138277850414; Wed, 24 Jul 2019 04:59:29 -0700 (PDT) Received: from localhost ([::1]:50740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFvX-0000T9-D2 for importer@patchew.org; Wed, 24 Jul 2019 07:59:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36608) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFuh-0005YJ-It for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqFug-0004cw-LE for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49926) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqFug-0004cX-FD for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:30 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id C7F3533645; Wed, 24 Jul 2019 11:58:29 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-166.ams2.redhat.com [10.36.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF62A600D1; Wed, 24 Jul 2019 11:58:28 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, pavel.dovgaluk@ispras.ru Date: Wed, 24 Jul 2019 12:58:22 +0100 Message-Id: <20190724115823.4199-4-dgilbert@redhat.com> In-Reply-To: <20190724115823.4199-1-dgilbert@redhat.com> References: <20190724115823.4199-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 24 Jul 2019 11:58:29 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [for 4.2 PATCH v2 3/4] replay: Remove host_clock_last X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Now we're not using the 'last' field in the timer, remove it from replay. Bump the version number of the replay structure since we've removed the field. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Pavel Dovgalyuk --- replay/replay-snapshot.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index 756f48bc02..3a58734b9a 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -24,7 +24,6 @@ static int replay_pre_save(void *opaque) { ReplayState *state =3D opaque; state->file_offset =3D ftell(replay_file); - state->host_clock_last =3D qemu_clock_get_last(QEMU_CLOCK_HOST); =20 return 0; } @@ -34,7 +33,6 @@ static int replay_post_load(void *opaque, int version_id) ReplayState *state =3D opaque; if (replay_mode =3D=3D REPLAY_MODE_PLAY) { fseek(replay_file, state->file_offset, SEEK_SET); - qemu_clock_set_last(QEMU_CLOCK_HOST, state->host_clock_last); /* If this was a vmstate, saved in recording mode, we need to initialize replay data fields. */ replay_fetch_data_kind(); @@ -50,8 +48,8 @@ static int replay_post_load(void *opaque, int version_id) =20 static const VMStateDescription vmstate_replay =3D { .name =3D "replay", - .version_id =3D 1, - .minimum_version_id =3D 1, + .version_id =3D 2, + .minimum_version_id =3D 2, .pre_save =3D replay_pre_save, .post_load =3D replay_post_load, .fields =3D (VMStateField[]) { @@ -62,7 +60,6 @@ static const VMStateDescription vmstate_replay =3D { VMSTATE_UINT32(has_unread_data, ReplayState), VMSTATE_UINT64(file_offset, ReplayState), VMSTATE_UINT64(block_request_id, ReplayState), - VMSTATE_UINT64(host_clock_last, ReplayState), VMSTATE_INT32(read_event_kind, ReplayState), VMSTATE_UINT64(read_event_id, ReplayState), VMSTATE_INT32(read_event_checkpoint, ReplayState), --=20 2.21.0 From nobody Sun Feb 8 05:34:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563969560; cv=none; d=zoho.com; s=zohoarc; b=P4+xW3/W6jB3VxcO8K0djrd2TQBxJ5wc44jsNCwE8JfxEK6nHHmV1l0e/tXTTpxkLF6bp+x9F3a5LU+I02v/Gwn9QluslZXXLJ9L0onasu4sY+4VxkkLxtqJltsINFOt6Hh8Z7lPV/mndPdBgFXd/Ag2GKyXX71mcGiZfklxduc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563969560; h=Content-Transfer-Encoding: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:ARC-Authentication-Results; bh=k0d1mqYNV7B88c6QdsBBrOmvR/9ydnCCUak97p6JhV0=; b=dTzeYERIKF3hY395hScPG2KWbfWsgQOXbKg6FhMOtLO+HtowoRJs7PgiY7vTBGd1wC6REvyDbzbL6cSK6MGDKlXbh4RY9xwc/KR1yBFATdkecP2dNDVVxrykuVLQ2g4X0Gom6fLTisBo5tz0LaMdV08n+13u1aSbQ1/8boFuNlc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156396956037321.473514698523786; Wed, 24 Jul 2019 04:59:20 -0700 (PDT) Received: from localhost ([::1]:50738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFvS-0000Cu-Sb for importer@patchew.org; Wed, 24 Jul 2019 07:59:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36625) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFui-0005dp-Ql for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqFuh-0004ei-PB for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqFuh-0004dO-K5 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:58:31 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id EC6053086272; Wed, 24 Jul 2019 11:58:30 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-166.ams2.redhat.com [10.36.117.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D281600D1; Wed, 24 Jul 2019 11:58:29 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, pavel.dovgaluk@ispras.ru Date: Wed, 24 Jul 2019 12:58:23 +0100 Message-Id: <20190724115823.4199-5-dgilbert@redhat.com> In-Reply-To: <20190724115823.4199-1-dgilbert@redhat.com> References: <20190724115823.4199-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Wed, 24 Jul 2019 11:58:31 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [for 4.2 PATCH v2 4/4] timer: last, remove last bits of last X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" The reset notifiers kept a 'last' counter to notice jumps; now that we've remove the notifier we don't need to keep 'last'. Signed-off-by: Dr. David Alan Gilbert --- include/qemu/timer.h | 13 ------------- util/qemu-timer.c | 22 +--------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 6817c78ef4..5bcab935f6 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -248,19 +248,6 @@ bool qemu_clock_run_timers(QEMUClockType type); */ bool qemu_clock_run_all_timers(void); =20 -/** - * qemu_clock_get_last: - * - * Returns last clock query time. - */ -uint64_t qemu_clock_get_last(QEMUClockType type); -/** - * qemu_clock_set_last: - * - * Sets last clock query time. - */ -void qemu_clock_set_last(QEMUClockType type, uint64_t last); - =20 /* * QEMUTimerList diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 2faaaf9926..b73041df4e 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -48,8 +48,6 @@ typedef struct QEMUClock { /* We rely on BQL to protect the timerlists */ QLIST_HEAD(, QEMUTimerList) timerlists; =20 - int64_t last; - QEMUClockType type; bool enabled; } QEMUClock; @@ -130,7 +128,6 @@ static void qemu_clock_init(QEMUClockType type, QEMUTim= erListNotifyCB *notify_cb =20 clock->type =3D type; clock->enabled =3D (type =3D=3D QEMU_CLOCK_VIRTUAL ? false : true); - clock->last =3D INT64_MIN; QLIST_INIT(&clock->timerlists); main_loop_tlg.tl[type] =3D timerlist_new(type, notify_cb, NULL); } @@ -628,9 +625,6 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *= tlg) =20 int64_t qemu_clock_get_ns(QEMUClockType type) { - int64_t now; - QEMUClock *clock =3D qemu_clock_ptr(type); - switch (type) { case QEMU_CLOCK_REALTIME: return get_clock(); @@ -642,26 +636,12 @@ int64_t qemu_clock_get_ns(QEMUClockType type) return cpu_get_clock(); } case QEMU_CLOCK_HOST: - now =3D REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime()); - clock->last =3D now; - return now; + return REPLAY_CLOCK(REPLAY_CLOCK_HOST, get_clock_realtime()); case QEMU_CLOCK_VIRTUAL_RT: return REPLAY_CLOCK(REPLAY_CLOCK_VIRTUAL_RT, cpu_get_clock()); } } =20 -uint64_t qemu_clock_get_last(QEMUClockType type) -{ - QEMUClock *clock =3D qemu_clock_ptr(type); - return clock->last; -} - -void qemu_clock_set_last(QEMUClockType type, uint64_t last) -{ - QEMUClock *clock =3D qemu_clock_ptr(type); - clock->last =3D last; -} - void init_clocks(QEMUTimerListNotifyCB *notify_cb) { QEMUClockType type; --=20 2.21.0