From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAdgq-0001fX-Ca for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:01:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YAdgl-00076A-EO for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:01:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YAdgl-000763-7T for qemu-devel@nongnu.org; Mon, 12 Jan 2015 07:01:43 -0500 Message-ID: <54B3B796.8060003@redhat.com> Date: Mon, 12 Jan 2015 13:01:26 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <20150112115944.3504.66763.stgit@PASHA-ISP> <20150112120043.3504.74278.stgit@PASHA-ISP> In-Reply-To: <20150112120043.3504.74278.stgit@PASHA-ISP> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC PATCH v7 10/21] cpus: make icount warp deterministic in replay mode List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Pavel Dovgalyuk , 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 On 12/01/2015 13:00, Pavel Dovgalyuk wrote: > This patch fixes icount warp rt timer. It should be based on virtual_rt > clock to be deterministic. > > Signed-off-by: Pavel Dovgalyuk > --- > cpus.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/cpus.c b/cpus.c > index 0c368f2..8787277 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -325,7 +325,7 @@ static void icount_adjust(void) > static void icount_adjust_rt(void *opaque) > { > timer_mod(icount_rt_timer, > - qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + 1000); > + qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL_RT) + 1000); > icount_adjust(); > } > > Oops, this is indeed a rebase conflict in the VIRTUAL_RT patches. I'll include this now. Paolo