From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8H-00058W-IO for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STz8B-0000cC-TD for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:29 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49632 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8B-0000an-Kg 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:56 +0200 Message-Id: <1337016729-12285-10-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 09/22] integratorcp: 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/integratorcp.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 9bdb9e6..46fd09d 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -443,7 +443,7 @@ static void integratorcp_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmd= line, const char *initrd_filename, const char *cpu_model) { - CPUARMState *env; + ARMCPU *cpu; MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *ram_alias =3D g_new(MemoryRegion, 1); @@ -452,13 +452,15 @@ static void integratorcp_init(ram_addr_t ram_size, DeviceState *dev; int i; =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); } + memory_region_init_ram(ram, "integrator.ram", ram_size); vmstate_register_ram_global(ram); /* ??? On a real system the first 1Mb is mapped as SSRAM or boot fla= sh. */ @@ -474,7 +476,7 @@ static void integratorcp_init(ram_addr_t ram_size, qdev_init_nofail(dev); sysbus_mmio_map((SysBusDevice *)dev, 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("integrator_pic", 0x14000000, cpu_pic[ARM_PIC_CPU_IRQ], cpu_pic[ARM_PIC_CPU_FIQ], NULL); @@ -500,7 +502,7 @@ static void integratorcp_init(ram_addr_t ram_size, integrator_binfo.kernel_filename =3D kernel_filename; integrator_binfo.kernel_cmdline =3D kernel_cmdline; integrator_binfo.initrd_filename =3D initrd_filename; - arm_load_kernel(env, &integrator_binfo); + arm_load_kernel(&cpu->env, &integrator_binfo); } =20 static QEMUMachine integratorcp_machine =3D { --=20 1.7.7