From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2U-0001a1-7a for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SSH2R-0005gF-IY for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35622 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SSH2R-0005fQ-C6 for qemu-devel@nongnu.org; Wed, 09 May 2012 20:15:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 10 May 2012 02:14:32 +0200 Message-Id: <1336608892-30501-55-git-send-email-afaerber@suse.de> In-Reply-To: <1336608892-30501-1-git-send-email-afaerber@suse.de> References: <1336608892-30501-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH next v2 54/74] cris-boot: Pass CRISCPU to cris_load_image() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for main_cpu_reset(). Signed-off-by: Andreas F=C3=A4rber --- 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, =20 li.image_filename =3D kernel_filename; li.cmdline =3D kernel_cmdline; - cris_load_image(env, &li); + cris_load_image(cpu, &li); } =20 static QEMUMachine axisdev88_machine =3D { 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; } =20 -void cris_load_image(CPUCRISState *env, struct cris_load_info *li) +void cris_load_image(CRISCPU *cpu, struct cris_load_info *li) { + CPUCRISState *env =3D &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; }; =20 -void cris_load_image(CPUCRISState *env, struct cris_load_info *li); +void cris_load_image(CRISCPU *cpu, struct cris_load_info *li); --=20 1.7.7