aboutsummaryrefslogtreecommitdiffstats
path: root/vl-android.c
diff options
context:
space:
mode:
authorOt ten Thije <ottenthije@google.com>2010-09-20 10:29:22 +0100
committerOt ten Thije <ottenthije@google.com>2010-10-14 16:20:03 +0100
commit871da2aa80687142bec00ef7c1112253c76c32bb (patch)
tree02e55b1f236f63516c13b47e1b68b092b400f390 /vl-android.c
parentbd62acb45d0199940f3baecfa288a2173e4428ae (diff)
downloadexternal_qemu-871da2aa80687142bec00ef7c1112253c76c32bb.zip
external_qemu-871da2aa80687142bec00ef7c1112253c76c32bb.tar.gz
external_qemu-871da2aa80687142bec00ef7c1112253c76c32bb.tar.bz2
Added state snapshot support for QemuD.
With this patch, both modem and sensor functionality are correctly restored when a state snapshot is loaded. This was not the case previously because communication with either of these services is done using the qemud daemon, which did not support snapshots. The boot-properties and charpipe services have no specific save/load functionality yet, since the framework itself should be reviewed first. Adding support for bootproperties should not be difficult though, and charpipe may not need it. For a description of the high-level process for saving and loading, consult section IV "State snapshots" in docs/ANDROID-QEMUD.TXT. Change-Id: I5b06d88b911ca096e78060163174904c48a01c66
Diffstat (limited to 'vl-android.c')
-rw-r--r--vl-android.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vl-android.c b/vl-android.c
index a946a35..fce438e 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -5419,12 +5419,12 @@ int main(int argc, char **argv, char **envp)
gdbstub_dev);
}
- if (loadvm)
- do_loadvm(cur_mon, loadvm);
-
/* call android-specific setup function */
android_emulation_setup();
+ if (loadvm)
+ do_loadvm(cur_mon, loadvm);
+
if (incoming) {
autostart = 0; /* fixme how to deal with -daemonize */
qemu_start_incoming_migration(incoming);