From patchwork Fri Nov 7 10:33:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 408050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5F6ED14010F for ; Fri, 7 Nov 2014 21:40:02 +1100 (AEDT) Received: from localhost ([::1]:59382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmgxU-0006Ew-AC for incoming@patchwork.ozlabs.org; Fri, 07 Nov 2014 05:40:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xmgqo-00036h-U4 for qemu-devel@nongnu.org; Fri, 07 Nov 2014 05:33:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xmgqi-0000PV-SP for qemu-devel@nongnu.org; Fri, 07 Nov 2014 05:33:06 -0500 Received: from mail.ispras.ru ([83.149.199.45]:49199) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xmgqi-0000PK-GD for qemu-devel@nongnu.org; Fri, 07 Nov 2014 05:33:00 -0500 Received: from [10.10.150.171] (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id B6AB0540151; Fri, 7 Nov 2014 13:32:59 +0300 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Fri, 07 Nov 2014 13:33:04 +0300 Message-ID: <20141107103304.6136.29222.stgit@PASHA-ISP> In-Reply-To: <20141107103123.6136.18545.stgit@PASHA-ISP> References: <20141107103123.6136.18545.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, alex.bennee@linaro.org, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH v4 17/25] cpus: make icount warp deterministic in replay mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds saving and replaying warping parameters in record and replay modes. These parameters affect on virtual clock values and therefore should be deterministic. Signed-off-by: Pavel Dovgalyuk --- cpus.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/cpus.c b/cpus.c index b41baf6..dac222b 100644 --- a/cpus.c +++ b/cpus.c @@ -370,7 +370,9 @@ static void icount_warp_rt(void *opaque) seqlock_write_lock(&timers_state.vm_clock_seqlock); if (runstate_is_running()) { - int64_t clock = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); + int64_t clock = qemu_clock_get_ns(replay_mode == REPLAY_MODE_NONE + ? QEMU_CLOCK_REALTIME + : QEMU_CLOCK_HOST); int64_t warp_delta; warp_delta = clock - vm_clock_warp_start; @@ -444,7 +446,9 @@ void qemu_clock_warp(QEMUClockType type) } /* We want to use the earliest deadline from ALL vm_clocks */ - clock = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); + clock = qemu_clock_get_ns(replay_mode == REPLAY_MODE_NONE + ? QEMU_CLOCK_REALTIME + : QEMU_CLOCK_HOST); deadline = qemu_clock_deadline_ns_all(QEMU_CLOCK_VIRTUAL); if (deadline < 0) { return; @@ -537,8 +541,10 @@ void configure_icount(QemuOpts *opts, Error **errp) return; } icount_align_option = qemu_opt_get_bool(opts, "align", false); - icount_warp_timer = timer_new_ns(QEMU_CLOCK_REALTIME, - icount_warp_rt, NULL); + icount_warp_timer = timer_new_ns(replay_mode == REPLAY_MODE_NONE + ? QEMU_CLOCK_REALTIME + : QEMU_CLOCK_HOST, + icount_warp_rt, NULL); if (strcmp(option, "auto") != 0) { errno = 0; icount_time_shift = strtol(option, &rem_str, 0); @@ -562,10 +568,14 @@ void configure_icount(QemuOpts *opts, Error **errp) the virtual time trigger catches emulated time passing too fast. Realtime triggers occur even when idle, so use them less frequently than VM triggers. */ - icount_rt_timer = timer_new_ms(QEMU_CLOCK_REALTIME, - icount_adjust_rt, NULL); + icount_rt_timer = timer_new_ms(replay_mode == REPLAY_MODE_NONE + ? QEMU_CLOCK_REALTIME + : QEMU_CLOCK_HOST, + icount_adjust_rt, NULL); timer_mod(icount_rt_timer, - qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1000); + qemu_clock_get_ms(replay_mode == REPLAY_MODE_NONE + ? QEMU_CLOCK_REALTIME + : QEMU_CLOCK_HOST) + 1000); icount_vm_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, icount_adjust_vm, NULL); timer_mod(icount_vm_timer,