From nobody Sat May 18 05:34:57 2024 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=1563808076; cv=none; d=zoho.com; s=zohoarc; b=FVEE8WVurGp4nCsVjCkzesPPKL3Jgm/ubnFD94fwKbvNcIE+l4RvPcvwprxxdHbKfcAwj4AGlPm9Wa5z0Q30aRFGYGiI4wNsX6XHgaPIpxM9DLf7xAB9bwF5bCSOExHnxIYyqkdYWzTtvbxt1IDPaAhZCyUbBHHgZ71ZDwaGGVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563808076; 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=CJC0z7cy/9rWyqDS+Nc5eQBaQD/WzWJJpUxk/qboLM6eBxJAh6z3zpNxTd+5E2FXHnzhpl5nOQM+13c7W/nTQVQxrG29uZLhcVur5/elBI9oCdKcNS8e5enAImaifT9x7ld85En/Xas1KEbEEN8stSjBj8J40acfSfhF7pXXaHI= 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 1563808076706597.2628479802546; Mon, 22 Jul 2019 08:07:56 -0700 (PDT) Received: from localhost ([::1]:34414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZut-0006Ra-5o for importer@patchew.org; Mon, 22 Jul 2019 11:07:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44817) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZuP-0005B7-M0 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpZuO-0002ep-N8 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39559) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpZuO-0002eC-Hr for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:24 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D925830821A0; Mon, 22 Jul 2019 15:07:23 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-221.ams2.redhat.com [10.36.117.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4345544EE; Mon, 22 Jul 2019 15:07:21 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, pavel.dovgaluk@ispras.ru Date: Mon, 22 Jul 2019 16:07:15 +0100 Message-Id: <20190722150717.10564-2-dgilbert@redhat.com> In-Reply-To: <20190722150717.10564-1-dgilbert@redhat.com> References: <20190722150717.10564-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 22 Jul 2019 15:07:23 +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 1/3] 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 Sat May 18 05:34:57 2024 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=1563808083; cv=none; d=zoho.com; s=zohoarc; b=dUoMFfZBkrQG3Tp41p/kYHCY9bE5mD5Zec2tjds/5fwFSLfvxIC+dycWjQIusGEnCPXAZKA/sz5DAG5IF5Ex5ev5E/Seyiqm+u22PVu8K4nLLf+S/bX5Ha7OsEmnDId65DFZbrLYlJohbOaiEVGpSgs+VLoMuPOBqBpOIiQ5+5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563808083; 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=BY2CPepMRo3DcwGW6gNvN/Nq422189xO27NAz2S12VsO5mJIAp8ztLBPc5ZRs/9S9z8ucJfJ7xzeCz/8EErrhJ1AY8nzW8oPUSMYxyWLAVL2C24Ox8bo0SzZdGg7ykTZ4sDqZpR/WFrFotRPst1rJCOSyLIoJk+fKpbEH1/425A= 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 1563808083107846.2016175140586; Mon, 22 Jul 2019 08:08:03 -0700 (PDT) Received: from localhost ([::1]:34416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZuz-0006rv-JL for importer@patchew.org; Mon, 22 Jul 2019 11:08:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44829) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZuS-0005Mu-To for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpZuQ-0002gH-Mr for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55256) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpZuQ-0002fs-E1 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B9CCF2C9700; Mon, 22 Jul 2019 15:07:25 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-221.ams2.redhat.com [10.36.117.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E264544EE; Mon, 22 Jul 2019 15:07:24 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, pavel.dovgaluk@ispras.ru Date: Mon, 22 Jul 2019 16:07:16 +0100 Message-Id: <20190722150717.10564-3-dgilbert@redhat.com> In-Reply-To: <20190722150717.10564-1-dgilbert@redhat.com> References: <20190722150717.10564-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 22 Jul 2019 15:07:25 +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 2/3] 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 Sat May 18 05:34:57 2024 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=1563808101; cv=none; d=zoho.com; s=zohoarc; b=EZIf7xQLji8+hKw3CIbCDmYQSOkk6wHRD9tdznMgxWJTC85oWMfZeg+b1aYknK/UYBbaVWiQw2uUnRKM+1HUcQkU4BHLKe6ppxN+wShbbi3sUrjgo7n+5wNTZxxoDcTnToe04j3yP+9VoSkBFMWdVDTaqz0U8R+FTu3M+mVdHD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563808101; 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=ZKUVzhOoHqbwfhPkNrDI93qoOpyCTXLZTgmF2EiNSBs=; b=kDuQ9J1g02CfVQ6B3fPRcY29rje59VIl5x6A2ifh9MOuDn4P+p2lLDOGLUGd/flpL3HFedcmFGDI8dyxlH/3xQHyaz6gI45KZ/gSz72rnvhw0MimAeEtIJWLxdoHcmvMK+3b0UJsjn0JsDsdev8MAPxMfZoeEmBcD7oHU4PMChI= 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 1563808101168810.962103651685; Mon, 22 Jul 2019 08:08:21 -0700 (PDT) Received: from localhost ([::1]:34428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZvI-0008EQ-3z for importer@patchew.org; Mon, 22 Jul 2019 11:08:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44838) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZuT-0005Q4-QB for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpZuS-0002hU-EV for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46620) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpZuS-0002gy-5s for qemu-devel@nongnu.org; Mon, 22 Jul 2019 11:07:28 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7E12885539; Mon, 22 Jul 2019 15:07:27 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-221.ams2.redhat.com [10.36.117.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EE6B5D72E; Mon, 22 Jul 2019 15:07:25 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, pbonzini@redhat.com, pavel.dovgaluk@ispras.ru Date: Mon, 22 Jul 2019 16:07:17 +0100 Message-Id: <20190722150717.10564-4-dgilbert@redhat.com> In-Reply-To: <20190722150717.10564-1-dgilbert@redhat.com> References: <20190722150717.10564-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 22 Jul 2019 15:07: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 3/3] 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'. replay used to save/restore 'last' (presumably to avoid triggering the notifier); make it store the current time instead which avoids changing it's migration format. Signed-off-by: Dr. David Alan Gilbert --- include/qemu/timer.h | 13 ------------- replay/replay-snapshot.c | 3 +-- util/qemu-timer.c | 22 +--------------------- 3 files changed, 2 insertions(+), 36 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/replay/replay-snapshot.c b/replay/replay-snapshot.c index 756f48bc02..ca6d4adcc0 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -24,7 +24,7 @@ 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); + state->host_clock_last =3D get_clock_realtime(); =20 return 0; } @@ -34,7 +34,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(); 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