[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/18] centralize handling of -icount
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 11/18] centralize handling of -icount |
Date: |
Wed, 10 Mar 2010 11:38:48 +0100 |
A simple patch to place together all handling of -icount.
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/vl.c b/vl.c
index 6cd77e6..d05bae5 100644
--- a/vl.c
+++ b/vl.c
@@ -701,8 +701,23 @@ static void icount_adjust_vm(void * opaque)
icount_adjust();
}
-static void init_icount_adjust(void)
+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.
@@ -4855,6 +4870,7 @@ int main(int argc, char **argv, char **envp)
uint32_t boot_devices_bitmap = 0;
int i;
int snapshot, linux_boot, net_boot;
+ const char *icount_option = NULL;
const char *initrd_filename;
const char *kernel_filename, *kernel_cmdline;
char boot_devices[33] = "cad"; /* default to HD->floppy->CD-ROM */
@@ -5605,12 +5621,7 @@ int main(int argc, char **argv, char **envp)
tb_size = 0;
break;
case QEMU_OPTION_icount:
- use_icount = 1;
- if (strcmp(optarg, "auto") == 0) {
- icount_time_shift = -1;
- } else {
- icount_time_shift = strtol(optarg, NULL, 0);
- }
+ icount_option = optarg;
break;
case QEMU_OPTION_incoming:
incoming = optarg;
@@ -5856,13 +5867,7 @@ int main(int argc, char **argv, char **envp)
fprintf(stderr, "could not initialize alarm timer\n");
exit(1);
}
- if (use_icount && icount_time_shift < 0) {
- use_icount = 2;
- /* 125MIPS seems a reasonable initial guess at the guest speed.
- It will be corrected fairly quickly anyway. */
- icount_time_shift = 3;
- init_icount_adjust();
- }
+ configure_icount(icount_option);
#ifdef _WIN32
socket_init();
--
1.6.6
- [Qemu-devel] [PATCH 01/18] avoid dubiously clever code in win32_start_timer, (continued)
- [Qemu-devel] [PATCH 01/18] avoid dubiously clever code in win32_start_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 02/18] fix error in win32_rearm_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 03/18] only one flag is needed for alarm_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 04/18] more alarm timer cleanup, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 05/18] do not use qemu_event_increment outside qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 07/18] remove qemu_rearm_alarm_timer from main loop, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 06/18] tweak qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 10/18] introduce and use qemu_clock_enable, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 11/18] centralize handling of -icount,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/18] change qemu_run_timers interface, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 13/18] add qemu_alarm_pending, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 12/18] add qemu_icount_round, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 14/18] new function qemu_icount_delta, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 15/18] move vmstate registration of vmstate_timers earlier, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 16/18] place together more #ifdef CONFIG_IOTHREAD blocks, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 17/18] disentangle tcg and deadline calculation, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 18/18] split out qemu-timer.c, Paolo Bonzini, 2010/03/10