aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-03-01 14:52:40 +0100
committerDavid 'Digit' Turner <digit@android.com>2011-03-01 15:07:12 +0100
commitd543578f5d2e900ca9a95befaf15d49da163d5fb (patch)
tree3c59e9a724a5c6f450da608e913f3f2cb7a80f72
parent26d415322b75784f123d39f36616b8ebd1fbb359 (diff)
downloadexternal_qemu-d543578f5d2e900ca9a95befaf15d49da163d5fb.zip
external_qemu-d543578f5d2e900ca9a95befaf15d49da163d5fb.tar.gz
external_qemu-d543578f5d2e900ca9a95befaf15d49da163d5fb.tar.bz2
Remove un-needed -clock unix core option.
Remove the '-clock unix' used to start the core on Linux. We do that by moving the problematic 'dynticks' clock to the end of the list in qemu-timer.c. The effect is that the unix clock will become the default for normal usage. You can still use the dynticks one for experimentation with -qemu -clock dynticks though. Change-Id: Ia7a8b2b262c62e8b80a82d6dbadec25964774b57
-rw-r--r--android/main.c9
-rw-r--r--qemu-timer.c10
2 files changed, 8 insertions, 11 deletions
diff --git a/android/main.c b/android/main.c
index 4315c4e..03cc2a8 100644
--- a/android/main.c
+++ b/android/main.c
@@ -804,15 +804,6 @@ int main(int argc, char **argv)
/* physical memory is now in hw->hw_ramSize */
- /* on Linux, the 'dynticks' clock sometimes doesn't work
- * properly. this results in the UI freezing while emulation
- * continues, for several seconds...
- */
-#ifdef __linux__
- args[n++] = "-clock";
- args[n++] = "unix";
-#endif
-
args[n++] = "-android-avdname";
args[n++] = (char*) avdInfo_getName(avd);
diff --git a/qemu-timer.c b/qemu-timer.c
index 0ed5ba9..82a5de3 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -394,14 +394,20 @@ int64_t qemu_icount_round(int64_t count)
static struct qemu_alarm_timer alarm_timers[] = {
#ifndef _WIN32
#ifdef __linux__
- {"dynticks", dynticks_start_timer,
- dynticks_stop_timer, dynticks_rearm_timer, NULL},
/* HPET - if available - is preferred */
{"hpet", hpet_start_timer, hpet_stop_timer, NULL, NULL},
/* ...otherwise try RTC */
{"rtc", rtc_start_timer, rtc_stop_timer, NULL, NULL},
#endif
{"unix", unix_start_timer, unix_stop_timer, NULL, NULL},
+#ifdef __linux__
+ /* on Linux, the 'dynticks' clock sometimes doesn't work
+ * properly. this results in the UI freezing while emulation
+ * continues, for several seconds... So move it to the end
+ * of the list. */
+ {"dynticks", dynticks_start_timer,
+ dynticks_stop_timer, dynticks_rearm_timer, NULL},
+#endif
#else
{"dynticks", win32_start_timer,
win32_stop_timer, win32_rearm_timer, &alarm_win32_data},