From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xmhyy-000750-Dx for qemu-devel@nongnu.org; Fri, 07 Nov 2014 06:45:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xmhyr-0001Mq-Vy for qemu-devel@nongnu.org; Fri, 07 Nov 2014 06:45:36 -0500 Received: from mail.ispras.ru ([83.149.199.45]:50756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xmhyr-0001Mf-5Z for qemu-devel@nongnu.org; Fri, 07 Nov 2014 06:45:29 -0500 From: "Pavel Dovgaluk" References: <20141107103123.6136.18545.stgit@PASHA-ISP> <20141107103304.6136.29222.stgit@PASHA-ISP> <545CABF1.5070501@redhat.com> In-Reply-To: <545CABF1.5070501@redhat.com> Date: Fri, 7 Nov 2014 14:45:32 +0300 Message-ID: <003d01cffa80$56a2c720$03e85560$@Dovgaluk@ispras.ru> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Content-Language: ru Subject: Re: [Qemu-devel] [RFC PATCH v4 17/25] cpus: make icount warp deterministic in replay mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: 'Paolo Bonzini' , qemu-devel@nongnu.org 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, afaerber@suse.de, fred.konrad@greensocs.com > From: Paolo Bonzini [mailto:pbonzini@redhat.com] > On 07/11/2014 11:33, Pavel Dovgalyuk wrote: > > 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. > > Why are QEMU_CLOCK_REALTIME timers not recorded/replayed like > QEMU_CLOCK_HOST is? We cannot record all QEMU_CLOCK_REALTIME timers, because they are simulator-related timers, not the VM-related ones. If we'll record them then we'll have to replay simulator execution. And we want just to replay VM allowing different realtime events to be non-replayable (like screen refresh, monitor events handling, and so on). Pavel Dovgalyuk > > > 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, > >