aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-08-09 14:39:20 +0300
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-24 08:01:39 -0500
commit6b99dadc4a533c1d05a4ea0bd20d08616df4a847 (patch)
tree938049165a950c26de84ab645edfc80c92c2f176
parent04a52b412037420e01276c92cf672dbab7f78399 (diff)
Do not disable autostart for live migration
If the user does not want autostart, they can specify -S. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--vl.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/vl.c b/vl.c
index 8b2b289031..55d5bbe76d 100644
--- a/vl.c
+++ b/vl.c
@@ -6040,12 +6040,10 @@ int main(int argc, char **argv, char **envp)
do_loadvm(cur_mon, loadvm);
if (incoming) {
- autostart = 0;
qemu_start_incoming_migration(incoming);
- }
-
- else if (autostart)
+ } else if (autostart) {
vm_start();
+ }
#ifndef _WIN32
if (daemonize) {