From patchwork Fri Oct 12 02:23:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 191048 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DEF5D2C0089 for ; Fri, 12 Oct 2012 13:24:24 +1100 (EST) Received: from localhost ([::1]:35599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMUvH-0007NC-17 for incoming@patchwork.ozlabs.org; Thu, 11 Oct 2012 22:24:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMUuK-0004Zt-F4 for qemu-devel@nongnu.org; Thu, 11 Oct 2012 22:23:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMUuH-0008Po-V0 for qemu-devel@nongnu.org; Thu, 11 Oct 2012 22:23:24 -0400 Received: from cantor2.suse.de ([195.135.220.15]:53900 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMUuH-0008Pk-OO for qemu-devel@nongnu.org; Thu, 11 Oct 2012 22:23:21 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 540D5A30ED; Fri, 12 Oct 2012 04:23:21 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Fri, 12 Oct 2012 04:23:07 +0200 Message-Id: <1350008589-30711-5-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350008589-30711-1-git-send-email-afaerber@suse.de> References: <1350008589-30711-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: blauwirbel@gmail.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v2 4/5] sun4u: Pass SPARCCPU to cpu_kick_irq() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Needed for changing qemu_cpu_kick() argument type to CPUState. Signed-off-by: Andreas Färber --- hw/sun4u.c | 10 ++++++---- 1 Datei geändert, 6 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 4cea102..0453522 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -310,8 +310,10 @@ void cpu_check_irqs(CPUSPARCState *env) } } -static void cpu_kick_irq(CPUSPARCState *env) +static void cpu_kick_irq(SPARCCPU *cpu) { + CPUSPARCState *env = &cpu->env; + env->halted = 0; cpu_check_irqs(env); qemu_cpu_kick(env); @@ -431,7 +433,7 @@ static void tick_irq(void *opaque) } env->softint |= SOFTINT_TIMER; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } static void stick_irq(void *opaque) @@ -449,7 +451,7 @@ static void stick_irq(void *opaque) } env->softint |= SOFTINT_STIMER; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } static void hstick_irq(void *opaque) @@ -467,7 +469,7 @@ static void hstick_irq(void *opaque) } env->softint |= SOFTINT_STIMER; - cpu_kick_irq(env); + cpu_kick_irq(cpu); } static int64_t cpu_to_timer_ticks(int64_t cpu_ticks, uint32_t frequency)