From nobody Tue Dec 16 05:37:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520984058240235.84699879024515; Tue, 13 Mar 2018 16:34:18 -0700 (PDT) Received: from localhost ([::1]:43535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evtQr-0003oV-AE for importer@patchew.org; Tue, 13 Mar 2018 19:34:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evsig-0006KK-7i for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evsie-000475-SR for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:34 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:46919) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evsie-00046i-Kq for qemu-devel@nongnu.org; Tue, 13 Mar 2018 18:48:32 -0400 Received: by mail-wr0-x243.google.com with SMTP id m12so2473691wrm.13 for ; Tue, 13 Mar 2018 15:48:32 -0700 (PDT) Received: from donizetti.lan (94-36-191-219.adsl-ull.clienti.tiscali.it. [94.36.191.219]) by smtp.gmail.com with ESMTPSA id x107sm1557951wrb.97.2018.03.13.15.48.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Mar 2018 15:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zbc5X/sBU78LkJBkYRysc/VoHFcj5cdYzRgbRDAwJd8=; b=jRnVh0F+ZzzufNyG8eEqHAMPcQWum5pExKF5izDDhtfKCyXZKh2rrrw1gVyhB4yO35 MhiQgZ6nsl/5n+ajFvBA7qAhsCXU2HEi4gqitzjXwDZhd2mZdviX33S4C8amZKXMdMR+ v9hK2XpsEhwRiEB9q2LJcRvgYZe+8DH1TzCiCTzPrt74Kq0ke7fyppX8bwENwrNQO4zp mWgzISryNRc3K30ukEOdTGZMBqhBa9rpok4ICKZ1ibBrAAt1BelxUFYZdJgrZsABnEMZ wxjWKG08Wq+UHfvfPNAzMYcPEO+pOuhMK5pzdfJrKhbdJEgZp7N0ZmzpMIs8GjYlC/Zp Iw7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Zbc5X/sBU78LkJBkYRysc/VoHFcj5cdYzRgbRDAwJd8=; b=Q5B1+wNsLw9FLpNDQjzlkRSgtSJw3LvtldMIgQgUYlZXnCkwBQ6uWI5n4uPTCplWX+ Kh6lfCq74bPExJMTdY0MXxrrw9ESSnf0TNNBZRV7FuyqYGyCol70JZECthtl/Z1RBSXb /vD2O74wjI5q/uNS/Yj5B+p49eMWyJzwf0nwAP7oXKCwtLYNkS981pfiqyHXQzTVsuJO YEKKyfDr0NwpKRi7jQASNCwnO/48G3iCYZAUTPxxEHVEFkQRZc+AOcYgx6YcPIm9ucDN rzWl60MiIxG0+svAFGf4NGaoGOzQvoNal9qEiHyaTNrSpuvuYxjBIXbh8d5QRfRsRlPW TPcg== X-Gm-Message-State: AElRT7FVkaNS5dXTihL1Gk8ddMrB3qLFASaMWlZrtPldmX1Ve0dIocha Cv+8pffq67WbXusFTdLOcAf4Uhy+ X-Google-Smtp-Source: AG47ELuJyEoMT6zplW8UHdQydxajzeO2U9iav6FPyJMfoNJpm5KTNXWGabKgQ4LQv1yZvOv5EzJIxA== X-Received: by 10.223.142.164 with SMTP id q33mr1951394wrb.72.1520981311190; Tue, 13 Mar 2018 15:48:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2018 23:47:07 +0100 Message-Id: <20180313224719.4954-58-pbonzini@redhat.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313224719.4954-1-pbonzini@redhat.com> References: <20180313224719.4954-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 57/69] replay: save prior value of the host clock X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk This patch adds saving/restoring of the host clock field 'last'. It is used in host clock calculation and therefore clock may become incorrect when using restored vmstate. Signed-off-by: Pavel Dovgalyuk Acked-by: Paolo Bonzini Message-Id: <20180227095226.1060.50975.stgit@pasha-VirtualBox> Signed-off-by: Paolo Bonzini Signed-off-by: Pavel Dovgalyuk --- include/qemu/timer.h | 14 ++++++++++++++ replay/replay-internal.h | 2 ++ replay/replay-snapshot.c | 3 +++ util/qemu-timer.c | 12 ++++++++++++ 4 files changed, 31 insertions(+) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 3b5a54b014..39ea907e65 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -251,6 +251,20 @@ 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); + + /* * QEMUTimerList */ diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 3ebb19912a..be96d7e879 100644 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -78,6 +78,8 @@ typedef struct ReplayState { This counter is global, because requests from different block devices should not get overlapping ids. */ uint64_t block_request_id; + /*! Prior value of the host clock */ + uint64_t host_clock_last; } ReplayState; extern ReplayState replay_state; =20 diff --git a/replay/replay-snapshot.c b/replay/replay-snapshot.c index 7075986ab5..e0b2204765 100644 --- a/replay/replay-snapshot.c +++ b/replay/replay-snapshot.c @@ -25,6 +25,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); =20 return 0; } @@ -33,6 +34,7 @@ static int replay_post_load(void *opaque, int version_id) { ReplayState *state =3D opaque; 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(); @@ -54,6 +56,7 @@ 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_END_OF_LIST() }, }; diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 82d56507a2..2ed1bf2778 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -622,6 +622,18 @@ int64_t qemu_clock_get_ns(QEMUClockType type) } } =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 qemu_clock_register_reset_notifier(QEMUClockType type, Notifier *notifier) { --=20 2.14.3