From 64a4d100b502f24d0116437b9e5678c032a233e6 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Mon, 4 Oct 2010 11:15:58 +0000 Subject: [PATCH] Don't call cpu_synchronize_state() from machine init. This will deadlock when the I/O thread is used, since the CPU thread is blocked waiting for qemu_system_ready. The synchronization is unnecessary since this is before cpu_synchronize_all_post_init(). Signed-off-by: Scott Wood Acked-by: Jan Kiszka Signed-off-by: Alexander Graf --- hw/ppc440_bamboo.c | 2 -- hw/ppce500_mpc8544ds.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 34ddf45477..645e84fd36 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -156,8 +156,6 @@ static void bamboo_init(ram_addr_t ram_size, exit(1); } - cpu_synchronize_state(env); - /* Set initial guest state. */ env->gpr[1] = (16<<20) - 8; env->gpr[3] = FDT_ADDR; diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index b7670ae27c..e111dda5f4 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -268,8 +268,6 @@ static void mpc8544ds_init(ram_addr_t ram_size, exit(1); } - cpu_synchronize_state(env); - /* Set initial guest state. */ env->gpr[1] = (16<<20) - 8; env->gpr[3] = dt_base;