Patchwork x86: fix miss merge

login
register
mail settings
Submitter Juan Quintela
Date Oct. 5, 2009, 6:30 p.m.
Message ID <1254767432-27013-1-git-send-email-quintela@redhat.com>
Download mbox | patch
Permalink /patch/35043/
State Superseded
Headers show

Comments

Juan Quintela - Oct. 5, 2009, 6:30 p.m.
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>
---
 target-i386/machine.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch

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 = {