From patchwork Sun May 6 15:34:54 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: 157185 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 A376EB6F13 for ; Mon, 7 May 2012 04:53:50 +1000 (EST) Received: from localhost ([::1]:34295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3XN-00040K-3h for incoming@patchwork.ozlabs.org; Sun, 06 May 2012 11:38:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VR-0001IK-Nb for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SR3VO-0000ry-Oy for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:17 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55408 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SR3VO-0000rT-IZ for qemu-devel@nongnu.org; Sun, 06 May 2012 11:36:14 -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 71C08A3DEB; Sun, 6 May 2012 17:36:13 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 6 May 2012 17:34:54 +0200 Message-Id: <1336318514-30906-55-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1336318514-30906-1-git-send-email-afaerber@suse.de> References: <1336318514-30906-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: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , "Edgar E. Iglesias" Subject: [Qemu-devel] [PATCH for-next 54/74] cris-boot: Pass CRISCPU to cris_load_image() 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 main_cpu_reset(). Signed-off-by: Andreas Färber --- hw/axis_dev88.c | 2 +- hw/cris-boot.c | 3 ++- hw/cris-boot.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c index 636708c..eab6327 100644 --- a/hw/axis_dev88.c +++ b/hw/axis_dev88.c @@ -346,7 +346,7 @@ void axisdev88_init (ram_addr_t ram_size, li.image_filename = kernel_filename; li.cmdline = kernel_cmdline; - cris_load_image(env, &li); + cris_load_image(cpu, &li); } static QEMUMachine axisdev88_machine = { diff --git a/hw/cris-boot.c b/hw/cris-boot.c index ca6c52f..331b2d1 100644 --- a/hw/cris-boot.c +++ b/hw/cris-boot.c @@ -60,8 +60,9 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr) return addr - 0x80000000LL; } -void cris_load_image(CPUCRISState *env, struct cris_load_info *li) +void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) { + CPUCRISState *env = &cpu->env; uint64_t entry, high; int kcmdline_len; int image_size; diff --git a/hw/cris-boot.h b/hw/cris-boot.h index ecb9779..0a2c242 100644 --- a/hw/cris-boot.h +++ b/hw/cris-boot.h @@ -8,4 +8,4 @@ struct cris_load_info target_phys_addr_t entry; }; -void cris_load_image(CPUCRISState *env, struct cris_load_info *li); +void cris_load_image(CRISCPU *cpu, struct cris_load_info *li);