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/main-ui.c | |
| 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/main-ui.c')
| -rw-r--r-- | android/main-ui.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/android/main-ui.c b/android/main-ui.c index 9366efd..16762a5 100644 --- a/android/main-ui.c +++ b/android/main-ui.c @@ -1520,14 +1520,18 @@ int main(int argc, char **argv) if (!opts->no_snapshot) { char* snapshot_name = opts->snapshot ? opts->snapshot : "default-boot"; - args[n++] = "-loadvm"; - args[n++] = snapshot_name; + if (!opts->no_snapshot_load) { + args[n++] = "-loadvm"; + args[n++] = snapshot_name; + } if (!opts->no_snapshot_save) { args[n++] = "-savevm-on-exit"; args[n++] = snapshot_name; } } else if (opts->snapshot) { dwarning("option '-no-snapshot' overrides '-snapshot', continuing with boot sequence"); + } else if (opts->no_snapshot_load || opts->no_snapshot_save) { + D("ignoring redundant option(s) '-no-snapshot-load' and/or '-no-snapshot-save' implied by '-no-snapshot'"); } } else if (opts->snapshot || opts->snapstorage) { dwarning("option '-no-snapstorage' overrides '-snapshot' and '-snapstorage', " |