]> git.proxmox.com Git - qemu.git/commitdiff
x86: fix miss merge
authorJuan Quintela <quintela@redhat.com>
Mon, 5 Oct 2009 18:30:32 +0000 (20:30 +0200)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Oct 2009 19:01:16 +0000 (14:01 -0500)
There was a missmerge, and then we got a tail recursive call to cpu_post_load
without case base :)

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
target-i386/machine.c

index c008209863a33e3181c0f7d8749443f89cac8882..b13eff494146376f97abbaa1ae9bb1ab6bb593ec 100644 (file)
@@ -383,7 +383,8 @@ static int cpu_post_load(void *opaque, int version_id)
         }
     }
 
-    return cpu_post_load(env, version_id);
+    tlb_flush(env, 1);
+    return 0;
 }
 
 const VMStateDescription vmstate_cpu = {