[Qemu-devel] [PATCH 2/5] Fix booke registers init

[Liu Yu]

Commit 8d2ba1fb9c8e7006e10d71fa51a020977f14c8b0
introduces a new new reset order.

So that we have to synchronize registers explicitly.

Signed-off-by: Liu Yu <address@hidden>
---
 hw/ppc440_bamboo.c     |    4 +++-
 hw/ppce500_mpc8544ds.c |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index d9ef3ec..f1ba130 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -182,8 +182,10 @@ static void bamboo_init(ram_addr_t ram_size,
         /* XXX we currently depend on KVM to create some initial TLB entries. 
*/
     }
 
-    if (kvm_enabled())
+    if (kvm_enabled()) {
+        kvm_arch_put_registers(env);
         kvmppc_init();
+    }
 }
 
 static QEMUMachine bamboo_machine = {
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index c0e367d..f1b3c1a 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -276,8 +276,10 @@ static void mpc8544ds_init(ram_addr_t ram_size,
         /* XXX we currently depend on KVM to create some initial TLB entries. 
*/
     }
 
-    if (kvm_enabled())
+    if (kvm_enabled()) {
+        kvm_arch_put_registers(env);
         kvmppc_init();
+    }
 
     return;
 }
-- 
1.5.4