From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41612) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8N-0005PJ-9j for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STz8B-0000bm-Pr for qemu-devel@nongnu.org; Mon, 14 May 2012 13:32:34 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49634 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STz8B-0000ao-Ke 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:57 +0200 Message-Id: <1337016729-12285-11-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 10/22] musicpal: 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, Jan Kiszka , =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for arm_load_kernel(). Signed-off-by: Andreas F=C3=A4rber --- hw/musicpal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/musicpal.c b/hw/musicpal.c index c9f845a..b7fed39 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1513,7 +1513,7 @@ static void musicpal_init(ram_addr_t ram_size, const char *kernel_filename, const char *kernel_cmdline, const char *initrd_filename, const char *cpu_model) { - CPUARMState *env; + ARMCPU *cpu; qemu_irq *cpu_pic; qemu_irq pic[32]; DeviceState *dev; @@ -1533,12 +1533,12 @@ static void musicpal_init(ram_addr_t ram_size, 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); } - cpu_pic =3D arm_pic_init_cpu(env); + cpu_pic =3D arm_pic_init_cpu(&cpu->env); =20 /* For now we use a fixed - the original - RAM size */ memory_region_init_ram(ram, "musicpal.ram", MP_RAM_DEFAULT_SIZE); @@ -1651,7 +1651,7 @@ static void musicpal_init(ram_addr_t ram_size, musicpal_binfo.kernel_filename =3D kernel_filename; musicpal_binfo.kernel_cmdline =3D kernel_cmdline; musicpal_binfo.initrd_filename =3D initrd_filename; - arm_load_kernel(env, &musicpal_binfo); + arm_load_kernel(&cpu->env, &musicpal_binfo); } =20 static QEMUMachine musicpal_machine =3D { --=20 1.7.7