From nobody Fri Nov 14 15:23:47 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=1589885071; cv=none; d=zohomail.com; s=zohoarc; b=S2oda73uSv3+Bu55Iuiz3HAmGNHqpnLsdX1i3W+ytMjVF/M3HLjTnPHxDCciRNd9jK+SDW1ccZ4eI0168ytRSfPMoNyE62x/u8K+mDibc2DlNs1a4eITz0RHIbPA6G7suHJnjKDLmFvS7QYgAHASLZlcOoBV5EkTscsu2zVdjhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589885071; 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=NR5QFEOb7Vy6KMqnQUsep1MoKMOA2IlGqd39x8OsqXE=; b=cxSvM8tTXjdNZK7vjAhDrd0U0xl99ogrq4ci3hgYp0YKi79hOV7m5jiFdWcdUYsn+F+zw6Q69F36fCEOCzuYpsk4J1yTxOvgh9WICSbnVQaXx3TkEzxrJST4n/VhYMJ/MgB11GSwN7+AHEgyEQJ9qD6J6nssGnXX1cAcsv5UQ7k= 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 1589885071779325.59238210494414; Tue, 19 May 2020 03:44:31 -0700 (PDT) Received: from localhost ([::1]:37420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jazjV-0000hi-5D for importer@patchew.org; Tue, 19 May 2020 06:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jaziV-0008FJ-4v for qemu-devel@nongnu.org; Tue, 19 May 2020 06:43:23 -0400 Received: from mail.ispras.ru ([83.149.199.45]:58358) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jaziU-0005kS-BR for qemu-devel@nongnu.org; Tue, 19 May 2020 06:43:22 -0400 Received: from [127.0.1.1] (unknown [62.118.151.149]) by mail.ispras.ru (Postfix) with ESMTPSA id C0336CD46B; Tue, 19 May 2020 13:43:20 +0300 (MSK) Subject: [PATCH] icount: fix shift=auto for record/replay From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Tue, 19 May 2020 13:43:20 +0300 Message-ID: <158988500050.15192.692077802469400393.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/19 06:21:18 X-ACL-Warn: Detected OS = Linux 3.11 and newer 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, rth@twiddle.net, alex.bennee@linaro.org, pavel.dovgaluk@ispras.ru, dovgaluk@ispras.ru 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 -- v2: moved icount_time_shift to vmstate subsection --- cpus.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/cpus.c b/cpus.c index 5670c96bcf..7ce0d569b3 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; @@ -647,6 +648,11 @@ static bool adjust_timers_state_needed(void *opaque) return s->icount_rt_timer !=3D NULL; } =20 +static bool shift_state_needed(void *opaque) +{ + return use_icount =3D=3D 2; +} + /* * Subsection for warp timer migration is optional, because may not be cre= ated */ @@ -674,6 +680,17 @@ static const VMStateDescription icount_vmstate_adjust_= timers =3D { } }; =20 +static const VMStateDescription icount_vmstate_shift =3D { + .name =3D "timer/icount/shift", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D shift_state_needed, + .fields =3D (VMStateField[]) { + VMSTATE_INT16(icount_time_shift, TimersState), + VMSTATE_END_OF_LIST() + } +}; + /* * This is a subsection for icount migration. */ @@ -690,6 +707,7 @@ static const VMStateDescription icount_vmstate_timers = =3D { .subsections =3D (const VMStateDescription*[]) { &icount_vmstate_warp_timer, &icount_vmstate_adjust_timers, + &icount_vmstate_shift, NULL } };