From patchwork Mon Dec 21 08:09:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 41537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 76183B6F08 for ; Mon, 21 Dec 2009 20:10:02 +1100 (EST) Received: from localhost ([127.0.0.1]:44483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMeH8-0007QG-OW for incoming@patchwork.ozlabs.org; Mon, 21 Dec 2009 04:09:58 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMdL3-0002ps-Np for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:58 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMdKv-0002lj-PV for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:55 -0500 Received: from [199.232.76.173] (port=52826 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMdKv-0002lO-8u for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43182) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NMdKu-0003pI-Lm for qemu-devel@nongnu.org; Mon, 21 Dec 2009 03:09:48 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89m9j001064 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 21 Dec 2009 03:09:48 -0500 Received: from localhost.localdomain (vpn2-10-119.ams2.redhat.com [10.36.10.119]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nBL89V3b011460 for ; Mon, 21 Dec 2009 03:09:47 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Dec 2009 09:09:28 +0100 Message-Id: <1261382970-23251-18-git-send-email-pbonzini@redhat.com> In-Reply-To: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> References: <1261382970-23251-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 17/19] move vmstate registration of vmstate_timers earlier X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- vl.c | 62 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 31 deletions(-) diff --git a/vl.c b/vl.c index 23ba687..204b6a0 100644 --- a/vl.c +++ b/vl.c @@ -697,36 +697,6 @@ static void icount_adjust_vm(void * opaque) icount_adjust(); } -static void configure_icount(const char *option) -{ - if (!option) - return; - - if (strcmp(option, "auto") != 0) { - icount_time_shift = strtol(option, NULL, 0); - use_icount = 1; - return; - } - - use_icount = 2; - - /* 125MIPS seems a reasonable initial guess at the guest speed. - It will be corrected fairly quickly anyway. */ - icount_time_shift = 3; - - /* Have both realtime and virtual time triggers for speed adjustment. - The realtime trigger catches emulated time passing too slowly, - 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 = qemu_new_timer(rt_clock, icount_adjust_rt, NULL); - qemu_mod_timer(icount_rt_timer, - qemu_get_clock(rt_clock) + 1000); - icount_vm_timer = qemu_new_timer(vm_clock, icount_adjust_vm, NULL); - qemu_mod_timer(icount_vm_timer, - qemu_get_clock(vm_clock) + get_ticks_per_sec() / 10); -} - static int64_t qemu_icount_round(int64_t count) { return (count + (1 << icount_time_shift) - 1) >> icount_time_shift; @@ -1019,6 +989,37 @@ static const VMStateDescription vmstate_timers = { } }; +static void configure_icount(const char *option) +{ + vmstate_register(0, &vmstate_timers, &timers_state); + if (!option) + return; + + if (strcmp(option, "auto") != 0) { + icount_time_shift = strtol(option, NULL, 0); + use_icount = 1; + return; + } + + use_icount = 2; + + /* 125MIPS seems a reasonable initial guess at the guest speed. + It will be corrected fairly quickly anyway. */ + icount_time_shift = 3; + + /* Have both realtime and virtual time triggers for speed adjustment. + The realtime trigger catches emulated time passing too slowly, + 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 = qemu_new_timer(rt_clock, icount_adjust_rt, NULL); + qemu_mod_timer(icount_rt_timer, + qemu_get_clock(rt_clock) + 1000); + icount_vm_timer = qemu_new_timer(vm_clock, icount_adjust_vm, NULL); + qemu_mod_timer(icount_vm_timer, + qemu_get_clock(vm_clock) + get_ticks_per_sec() / 10); +} + static void qemu_timer_bh(void *opaque) { struct qemu_alarm_timer *t = opaque; @@ -5673,7 +5674,6 @@ int main(int argc, char **argv, char **envp) if (qemu_opts_foreach(&qemu_drive_opts, drive_init_func, machine, 1) != 0) exit(1); - vmstate_register(0, &vmstate_timers ,&timers_state); register_savevm_live("ram", 0, 3, NULL, ram_save_live, NULL, ram_load, NULL);