From patchwork Tue Apr 10 13:15:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 10333151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0DAD56053B for ; Tue, 10 Apr 2018 13:16:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F31181FFEB for ; Tue, 10 Apr 2018 13:16:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7AAC22BF1; Tue, 10 Apr 2018 13:16:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B13BC1FFEB for ; Tue, 10 Apr 2018 13:16:56 +0000 (UTC) Received: from localhost ([::1]:44419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5t8p-0008Tk-Q2 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Apr 2018 09:16:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58801) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5t7q-0007og-L8 for qemu-devel@nongnu.org; Tue, 10 Apr 2018 09:15:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5t7m-0007Ch-GC for qemu-devel@nongnu.org; Tue, 10 Apr 2018 09:15:54 -0400 Received: from mail.ispras.ru ([83.149.199.45]:45814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5t7m-0007Ap-7h for qemu-devel@nongnu.org; Tue, 10 Apr 2018 09:15:50 -0400 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id F075654006A; Tue, 10 Apr 2018 16:15:47 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Tue, 10 Apr 2018 16:15:50 +0300 Message-ID: <20180410131550.20064.30595.stgit@pasha-VirtualBox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH] timer: fix record/replay timerlist probe 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: pbonzini@redhat.com, maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru, pavel.dovgaluk@ispras.ru Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Ciro Santilli reported that commit a5ed352596a8b7eb2f9acce34371b944ac3056c4 breaks the execution replay. It happens due to the probing the clock for the new instances of iothread. Probing of the timerlists' clock instead of using them for the deadlines calculation is critical for the replay. However, this probing was made for the timer lists that are empty. In record mode such lists are not used for the deadlines and corresponding clock does not queried. Therefore this patch disables quering the clock for the empty timerlists and disabled clocks. Signed-off-by: Pavel Dovgalyuk --- util/qemu-timer.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/qemu-timer.c b/util/qemu-timer.c index 2ed1bf2..e1c703c 100644 --- a/util/qemu-timer.c +++ b/util/qemu-timer.c @@ -587,7 +587,10 @@ int64_t timerlistgroup_deadline_ns(QEMUTimerListGroup *tlg) } else { /* Read clock from the replay file and do not calculate the deadline, based on virtual clock. */ - qemu_clock_get_ns(type); + if (atomic_read(&tlg->tl[type]->active_timers) + && tlg->tl[type]->clock->enabled) { + qemu_clock_get_ns(type); + } } } }