From bdb6f2dd35a4c749186e665d55d7b76375d7e71d Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 23 Feb 2011 15:57:25 +0100 Subject: Remove android/main-ui.c The differences between android/main.c and android/main-ui.c are now minimal, so remove the latter source file by moving the corresponding code into android/main-common.c Also add a -snapshot-no-time-update core option to implement the emulator-ui -no-snapshot-update-time option. We're probably going to clean this up a little in the future, but this is enough for now. Change-Id: I868bb4e47c3d106ae7436ee3f5b2c0ff5fb6ea5c --- qemu-options.hx | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qemu-options.hx') diff --git a/qemu-options.hx b/qemu-options.hx index 80efaa6..f35b4d0 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1782,4 +1782,7 @@ DEF("ui-settings", HAS_ARG, QEMU_OPTION_ui_settings, \ DEF("audio-test-out", 0, QEMU_OPTION_audio_test_out, \ "-audio-test-out Test audio output\n") +DEF("snapshot-no-time-update", 0, QEMU_OPTION_snapshot_no_time_update, \ + "-snapshot-no-time-update Disable time update when restoring snapshots\n") + #endif /* ANDROID */ -- cgit v1.1