From patchwork Mon Oct 4 21:15:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 66743 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 94AD4B6F06 for ; Tue, 5 Oct 2010 08:45:41 +1100 (EST) Received: from localhost ([127.0.0.1]:55307 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P2sOt-0004T5-R5 for incoming@patchwork.ozlabs.org; Mon, 04 Oct 2010 17:16:47 -0400 Received: from [140.186.70.92] (port=33768 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P2sOL-0004Sq-TF for qemu-devel@nongnu.org; Mon, 04 Oct 2010 17:16:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P2sOK-0002jo-FT for qemu-devel@nongnu.org; Mon, 04 Oct 2010 17:16:13 -0400 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:42482 helo=TX2EHSOBE002.bigfish.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P2sOK-0002jc-B0 for qemu-devel@nongnu.org; Mon, 04 Oct 2010 17:16:12 -0400 Received: from mail69-tx2-R.bigfish.com (10.9.14.241) by TX2EHSOBE002.bigfish.com (10.9.40.22) with Microsoft SMTP Server id 14.1.225.8; Mon, 4 Oct 2010 21:16:10 +0000 Received: from mail69-tx2 (localhost.localdomain [127.0.0.1]) by mail69-tx2-R.bigfish.com (Postfix) with ESMTP id 831B79783FC for ; Mon, 4 Oct 2010 21:16:10 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h64h) Received: from mail69-tx2 (localhost.localdomain [127.0.0.1]) by mail69-tx2 (MessageSwitch) id 1286226970370314_25861; Mon, 4 Oct 2010 21:16:10 +0000 (UTC) Received: from TX2EHSMHS034.bigfish.com (unknown [10.9.14.250]) by mail69-tx2.bigfish.com (Postfix) with ESMTP id 56CC8428053 for ; Mon, 4 Oct 2010 21:16:10 +0000 (UTC) Received: from az33egw01.freescale.net (192.88.158.102) by TX2EHSMHS034.bigfish.com (10.9.99.134) with Microsoft SMTP Server (TLS) id 14.0.482.44; Mon, 4 Oct 2010 21:16:10 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw01.freescale.net (8.14.3/8.14.3) with ESMTP id o94LFx4q029711 for ; Mon, 4 Oct 2010 14:16:09 -0700 (MST) Received: from az33exm25.fsl.freescale.net (az33exm25.am.freescale.net [10.64.32.16]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id o94LFwRF005581 for ; Mon, 4 Oct 2010 16:15:59 -0500 (CDT) Received: from udp111988uds.am.freescale.net ([10.82.121.95]) by az33exm25.fsl.freescale.net with Microsoft SMTPSVC(6.0.3790.4675); Mon, 4 Oct 2010 14:15:58 -0700 Date: Mon, 4 Oct 2010 16:15:58 -0500 From: Scott Wood To: QEMU Developers Message-ID: <20101004211558.GB27035@udp111988uds.am.freescale.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-OriginalArrivalTime: 04 Oct 2010 21:15:58.0479 (UTC) FILETIME=[56D9D1F0:01CB6409] X-Reverse-DNS: az33egw01.freescale.net X-detected-operating-system: by eggs.gnu.org: Windows 2000 SP2+, XP SP1+ (seldom 98) Subject: [Qemu-devel] [PATCH] Don't call cpu_synchronize_state() from machine init. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/ppc440_bamboo.c | 2 -- hw/ppce500_mpc8544ds.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 34ddf45..645e84f 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 1422fad..f7e9465 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c @@ -269,8 +269,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;