]> git.proxmox.com Git - qemu.git/commitdiff
qemu_system_reset: we need to call it before loadvm/migration
authorJuan Quintela <quintela@redhat.com>
Wed, 11 Nov 2009 23:39:13 +0000 (00:39 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 12 Nov 2009 17:23:56 +0000 (11:23 -0600)
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
vl.c

diff --git a/vl.c b/vl.c
index bf91ee15d4e7daaa75b3795aed384a3a2943eb38..fff8e8d4686a32d6c6f9cd418c779ae52a13bec8 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4044,7 +4044,6 @@ static void main_loop(void)
     qemu_system_ready = 1;
     qemu_cond_broadcast(&qemu_system_cond);
 #endif
-    qemu_system_reset();
 
     for (;;) {
         do {
@@ -5835,6 +5834,7 @@ int main(int argc, char **argv, char **envp)
 
     rom_load_all();
 
+    qemu_system_reset();
     if (loadvm) {
         if (load_vmstate(cur_mon, loadvm) < 0) {
             autostart = 0;