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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7508DC76188 for ; Mon, 22 Jul 2019 15:08:20 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4A7BB21903 for ; Mon, 22 Jul 2019 15:08:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A7BB21903 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpZvH-0008EQ-Ca for qemu-devel@archiver.kernel.org; Mon, 22 Jul 2019 11:08:19 -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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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_i= d) 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, QEMUT= imerListNotifyCB *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