From: Juan Quintela <quintela@redhat.com>
Date: Wed, 11 Nov 2009 23:39:13 +0000 (+0100)
Subject: qemu_system_reset: we need to call it before loadvm/migration
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=504c2948d3fb8d188d6e886cf6584edd344c1b46;p=qmiga%2Fqemu.git

qemu_system_reset: we need to call it before loadvm/migration

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/vl.c b/vl.c
index bf91ee15d4..fff8e8d468 100644
--- 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;