From nobody Mon Nov 10 11:24:06 2025 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1555932657; cv=none; d=zoho.com; s=zohoarc; b=luhXwsUiEEQOb931TgM5GUfUiOHg/K9BpzMoqQUggPWw5bDd0dckzKUAY+wj4Vq7lKtuF3P6Zml27rOrvoebysVzfHba4n9CcMJBL8Oi43NPzkacUBgVQ3AOvtG6noh2/o4qm8BeeNRV4Ni9NHiRqdOM+/4TVm72hYsaUM198Y0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1555932657; h=Content-Type:Content-Transfer-Encoding:Cc: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=9Hkl05lEBendV4BP3tnHwQAq7mqrpbUnhzaoeK9mnsk=; b=OPS0tVEYqIZUOvLXcKMBYmRkS7ew716fP+WTgclNnogb+7em4GyAUyPegh96aicAoNI7h74vSqfY2MQY5942eTgqUKneFBiGkfRU2WI2GGjMvlbOzcmNtltATPVv0z1IPuN/lWCG5trq1dzo2jnIiCgsx1ts5nnuuz/UkD3xB78= 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 1555932657877416.7001395996855; Mon, 22 Apr 2019 04:30:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:35911 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIXA0-0000NX-QW for importer@patchew.org; Mon, 22 Apr 2019 07:30:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40264) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIX0R-0000cc-Rk for qemu-devel@nongnu.org; Mon, 22 Apr 2019 07:21:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIX0Q-0002AX-0H for qemu-devel@nongnu.org; Mon, 22 Apr 2019 07:21:03 -0400 Received: from mail.ispras.ru ([83.149.199.45]:47134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIX0O-00028a-0G for qemu-devel@nongnu.org; Mon, 22 Apr 2019 07:21:01 -0400 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 1DF2E5400A9; Mon, 22 Apr 2019 14:20:59 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Mon, 22 Apr 2019 14:20:58 +0300 Message-ID: <155593205889.21079.14799791777208991110.stgit@pasha-Precision-3630-Tower> In-Reply-To: <155593197705.21079.8238359471765771689.stgit@pasha-Precision-3630-Tower> References: <155593197705.21079.8238359471765771689.stgit@pasha-Precision-3630-Tower> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH for-4.1 14/24] replay: refine replay-time module 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: kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, crosthwaite.peter@gmail.com, ciro.santilli@gmail.com, jasowang@redhat.com, quintela@redhat.com, armbru@redhat.com, mreitz@redhat.com, alex.bennee@linaro.org, maria.klimushenkova@ispras.ru, mst@redhat.com, kraxel@redhat.com, boost.lists@gmail.com, thomas.dullien@googlemail.com, dovgaluk@ispras.ru, artem.k.pisarenko@gmail.com, dgilbert@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" From: Pavel Dovgalyuk This patch removes refactoring artifacts from the replay/replay-time.c Signed-off-by: Pavel Dovgalyuk --- replay/replay-time.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/replay/replay-time.c b/replay/replay-time.c index 0df1693337..60f47b73a7 100644 --- a/replay/replay-time.c +++ b/replay/replay-time.c @@ -15,18 +15,19 @@ #include "replay-internal.h" #include "qemu/error-report.h" =20 -int64_t replay_save_clock(ReplayClockKind kind, int64_t clock, int64_t raw= _icount) +int64_t replay_save_clock(ReplayClockKind kind, int64_t clock, + int64_t raw_icount) { - if (replay_file) { - g_assert(replay_mutex_locked()); + g_assert(replay_file); + g_assert(replay_mutex_locked()); =20 - /* Due to the caller's locking requirements we get the icount from= it - * instead of using replay_save_instructions(). - */ - replay_advance_current_step(raw_icount); - replay_put_event(EVENT_CLOCK + kind); - replay_put_qword(clock); - } + /* + * Due to the caller's locking requirements we get the icount from it + * instead of using replay_save_instructions(). + */ + replay_advance_current_step(raw_icount); + replay_put_event(EVENT_CLOCK + kind); + replay_put_qword(clock); =20 return clock; } @@ -48,20 +49,15 @@ void replay_read_next_clock(ReplayClockKind kind) /*! Reads next clock event from the input. */ int64_t replay_read_clock(ReplayClockKind kind) { + int64_t ret; g_assert(replay_file && replay_mutex_locked()); =20 replay_account_executed_instructions(); =20 - if (replay_file) { - int64_t ret; - if (replay_next_event_is(EVENT_CLOCK + kind)) { - replay_read_next_clock(kind); - } - ret =3D replay_state.cached_clock[kind]; - - return ret; + if (replay_next_event_is(EVENT_CLOCK + kind)) { + replay_read_next_clock(kind); } + ret =3D replay_state.cached_clock[kind]; =20 - error_report("REPLAY INTERNAL ERROR %d", __LINE__); - exit(1); + return ret; }