From nobody Fri Nov 14 15:23:50 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1588751599; cv=none; d=zohomail.com; s=zohoarc; b=VsH/wHAf1WGP1R7I6FgxlkorI+fv6c8HBhfLhKYo889+s+JMODGW8qL9mMuzZIktnjqQjsfruXrhj2j8Yy/mWHeyNASfCx60weFKtufMEkubr8abR1BdyIUGs9fgFWpwApB2UxhXm/I1jfMowm3rBGbsP2rVKyFCa2SzUA30tOY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588751599; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=qvsMdF5IhiMi2wD3159ru96S/ETEsm5lPI1Tes+lSOk=; b=hkPOR3sAriTqCUmTWdo5+N21Vk/pEFScwXTIzimIU9MMyYjx4GhNssxP9Kp8V2wHUbi2Ar7dYPpFpJ4+4JcV0coMwItRCwNwW2fGmi6rhGC+3TWX0ybL/2uJRSbe/OxUKHluFoSKhp+4mOTE2ygud0qczp0SyZlYG0CuGOt0UJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.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 1588751599006789.1539645935261; Wed, 6 May 2020 00:53:19 -0700 (PDT) Received: from localhost ([::1]:37652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWErk-0006TP-NV for importer@patchew.org; Wed, 06 May 2020 03:53:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60588) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWEr0-0005zk-ER for qemu-devel@nongnu.org; Wed, 06 May 2020 03:52:30 -0400 Received: from mail.ispras.ru ([83.149.199.45]:36806) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWEqz-00085O-Fv for qemu-devel@nongnu.org; Wed, 06 May 2020 03:52:30 -0400 Received: from [127.0.1.1] (unknown [62.118.151.149]) by mail.ispras.ru (Postfix) with ESMTPSA id 907D9CD461; Wed, 6 May 2020 10:52:26 +0300 (MSK) Subject: [PATCH] icount: fix shift=auto for record/replay From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Wed, 06 May 2020 10:52:26 +0300 Message-ID: <158875154623.957.4036561733593052357.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: softfail client-ip=83.149.199.45; envelope-from=Pavel.Dovgaluk@gmail.com; helo=mail.ispras.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/06 03:52:27 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, NML_ADSP_CUSTOM_MED=0.9, SPF_SOFTFAIL=0.665, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: , Cc: pbonzini@redhat.com, dovgaluk@ispras.ru, pavel.dovgaluk@ispras.ru, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This patch fixes shift=3Dauto when record/replay is enabled. Now user does not need to guess the best shift value. Signed-off-by: Pavel Dovgalyuk --- cpus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cpus.c b/cpus.c index 5670c96bcf..dfb9f4717f 100644 --- a/cpus.c +++ b/cpus.c @@ -379,7 +379,8 @@ static void icount_adjust(void) =20 seqlock_write_lock(&timers_state.vm_clock_seqlock, &timers_state.vm_clock_lock); - cur_time =3D cpu_get_clock_locked(); + cur_time =3D REPLAY_CLOCK_LOCKED(REPLAY_CLOCK_VIRTUAL_RT, + cpu_get_clock_locked()); cur_icount =3D cpu_get_icount_locked(); =20 delta =3D cur_icount - cur_time; @@ -685,6 +686,7 @@ static const VMStateDescription icount_vmstate_timers = =3D { .fields =3D (VMStateField[]) { VMSTATE_INT64(qemu_icount_bias, TimersState), VMSTATE_INT64(qemu_icount, TimersState), + VMSTATE_INT16(icount_time_shift, TimersState), VMSTATE_END_OF_LIST() }, .subsections =3D (const VMStateDescription*[]) {