diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:39:42 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-19 13:39:42 -0500 |
| commit | 33cf629a3754b58a1e2dbbe01d91d97e712b7c06 (patch) | |
| tree | fcf874262294eba07fb2f9eca11d594096847679 /vl.c | |
| parent | b85a4ec8a7ce348f3f385a53df4e418f2f54c182 (diff) | |
| parent | c234572ded381423abca9801ebf5a32abd2495ef (diff) | |
| download | focaccia-qemu-33cf629a3754b58a1e2dbbe01d91d97e712b7c06.tar.gz focaccia-qemu-33cf629a3754b58a1e2dbbe01d91d97e712b7c06.zip | |
Merge remote-tracking branch 'sstabellini/saverestore-8' into staging
* sstabellini/saverestore-8: xen: do not allocate RAM during INMIGRATE runstate xen mapcache: check if memory region has moved. xen: record physmap changes to xenstore Set runstate to INMIGRATE earlier Introduce "xen-save-devices-state" cirrus_vga: do not reset videoram Conflicts: qapi-schema.json Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vl.c b/vl.c index eeb634b9ad..112b0e0af9 100644 --- a/vl.c +++ b/vl.c @@ -3099,6 +3099,7 @@ int main(int argc, char **argv, char **envp) break; case QEMU_OPTION_incoming: incoming = optarg; + runstate_set(RUN_STATE_INMIGRATE); break; case QEMU_OPTION_nodefaults: default_serial = 0; @@ -3616,7 +3617,6 @@ int main(int argc, char **argv, char **envp) } if (incoming) { - runstate_set(RUN_STATE_INMIGRATE); int ret = qemu_start_incoming_migration(incoming); if (ret < 0) { fprintf(stderr, "Migration failed. Exit code %s(%d), exiting.\n", |