[Qemu-commits] [COMMIT 1e7fbc6] x86: fix miss merge

[Anthony Liguori]

From: Juan Quintela <address@hidden>

There was a missmerge, and then we got a tail recursive call to cpu_post_load
without case base :)

Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

diff --git a/target-i386/machine.c b/target-i386/machine.c
index c008209..b13eff4 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -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 = {