diff options
| author | Tim Baverstock <weasel@google.com> | 2010-12-02 14:21:39 +0000 |
|---|---|---|
| committer | Tim Baverstock <weasel@google.com> | 2010-12-02 17:50:58 +0000 |
| commit | 53d8a5c0c8fc087d16316a4399f5a773339c4956 (patch) | |
| tree | af1e02fa9dff6839a1852711bdfc57f3725e31a0 /android/cmdline-options.h | |
| parent | 86ca19f7e89801a5735277a3c99df53d697dd2c4 (diff) | |
| download | external_qemu-53d8a5c0c8fc087d16316a4399f5a773339c4956.zip external_qemu-53d8a5c0c8fc087d16316a4399f5a773339c4956.tar.gz external_qemu-53d8a5c0c8fc087d16316a4399f5a773339c4956.tar.bz2 | |
Add -no-snapshot-load option to permit reboot.
This is a workaround for the emulator not being able to detect the guest's
power-down situation, and simply lingering like a zombie: on exit it's saved
as a zombie, and is restored as a zombie which isn't useful. Denying autoload
forces a reboot.
Change-Id: I48f32600f5ce18cd5c71aa01d1b71b382102f227
Diffstat (limited to 'android/cmdline-options.h')
| -rw-r--r-- | android/cmdline-options.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/android/cmdline-options.h b/android/cmdline-options.h index 3aaa478..fc30ebc 100644 --- a/android/cmdline-options.h +++ b/android/cmdline-options.h @@ -79,9 +79,10 @@ OPT_PARAM( sdcard, "<file>", "SD card image (default <system>/sdcard.img") #if CONFIG_ANDROID_SNAPSHOTS OPT_PARAM( snapstorage, "<file>", "file that contains all state snapshots (default <datadir>/snapshots.img)") OPT_FLAG ( no_snapstorage, "do not mount a snapshot storage file (this disables all snapshot functionality)" ) -OPT_PARAM( snapshot, "<name>", "immediately load state snapshot rather than doing a full boot (default 'default-boot')" ) -OPT_FLAG ( no_snapshot, "do not start from snapshot, but perform a full boot sequence" ) -OPT_FLAG ( no_snapshot_save, "do not preserve snapshot, if restore was attempted" ) +OPT_PARAM( snapshot, "<name>", "name of snapshot within storage file for auto-start and auto-save (default 'default-boot')" ) +OPT_FLAG ( no_snapshot, "perform a full boot and do not do not auto-save, but qemu vmload and vmsave operate on snapstorage" ) +OPT_FLAG ( no_snapshot_save, "do not auto-save to snapshot on exit: abandon changed state" ) +OPT_FLAG ( no_snapshot_load, "do not auto-start from snapshot: perform a full boot" ) OPT_FLAG ( snapshot_list, "show a list of available snapshots" ) #endif OPT_FLAG ( wipe_data, "reset the use data image (copy it from initdata)" ) |