From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8I-0005A1-N2 for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STz8B-0000by-RJ for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:30 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49631 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8B-0000ab-IG for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 14 May 2012 19:31:58 +0200 Message-Id: <1337016729-12285-12-git-send-email-afaerber@suse.de> In-Reply-To: <1337016729-12285-1-git-send-email-afaerber@suse.de> References: <1337016729-12285-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 qom-next 11/22] versatilepb: Use cpu_arm_init() to obtain ARMCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Needed for arm_load_kernel(). Signed-off-by: Andreas F=C3=A4rber --- hw/versatilepb.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/versatilepb.c b/hw/versatilepb.c index 7c79c54..d567af9 100644 --- a/hw/versatilepb.c +++ b/hw/versatilepb.c @@ -173,7 +173,7 @@ static void versatile_init(ram_addr_t ram_size, const char *initrd_filename, const char *cpu_model, int board_id) { - CPUARMState *env; + ARMCPU *cpu; MemoryRegion *sysmem =3D get_system_memory(); MemoryRegion *ram =3D g_new(MemoryRegion, 1); qemu_irq *cpu_pic; @@ -189,10 +189,11 @@ static void versatile_init(ram_addr_t ram_size, int done_smc =3D 0; DriveInfo *dinfo; =20 - if (!cpu_model) + if (!cpu_model) { cpu_model =3D "arm926"; - env =3D cpu_init(cpu_model); - if (!env) { + } + cpu =3D cpu_arm_init(cpu_model); + if (!cpu) { fprintf(stderr, "Unable to find CPU definition\n"); exit(1); } @@ -208,7 +209,7 @@ static void versatile_init(ram_addr_t ram_size, qdev_init_nofail(sysctl); sysbus_mmio_map(sysbus_from_qdev(sysctl), 0, 0x10000000); =20 - cpu_pic =3D arm_pic_init_cpu(env); + cpu_pic =3D arm_pic_init_cpu(&cpu->env); dev =3D sysbus_create_varargs("pl190", 0x10140000, cpu_pic[0], cpu_pic[1], NULL); for (n =3D 0; n < 32; n++) { @@ -338,7 +339,7 @@ static void versatile_init(ram_addr_t ram_size, versatile_binfo.kernel_cmdline =3D kernel_cmdline; versatile_binfo.initrd_filename =3D initrd_filename; versatile_binfo.board_id =3D board_id; - arm_load_kernel(env, &versatile_binfo); + arm_load_kernel(&cpu->env, &versatile_binfo); } =20 static void vpb_init(ram_addr_t ram_size, --=20 1.7.7