[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-next 10/22] musicpal: Use cpu_arm_init() to obta
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-next 10/22] musicpal: Use cpu_arm_init() to obtain ARMCPU |
Date: |
Mon, 14 May 2012 19:31:57 +0200 |
Needed for arm_load_kernel().
Signed-off-by: Andreas Färber <address@hidden>
---
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 = "arm926";
}
- env = cpu_init(cpu_model);
- if (!env) {
+ cpu = cpu_arm_init(cpu_model);
+ if (!cpu) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
- cpu_pic = arm_pic_init_cpu(env);
+ cpu_pic = arm_pic_init_cpu(&cpu->env);
/* 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 = kernel_filename;
musicpal_binfo.kernel_cmdline = kernel_cmdline;
musicpal_binfo.initrd_filename = initrd_filename;
- arm_load_kernel(env, &musicpal_binfo);
+ arm_load_kernel(&cpu->env, &musicpal_binfo);
}
static QEMUMachine musicpal_machine = {
--
1.7.7
- [Qemu-devel] [PATCH qom-next 02/22] omap_sx1: Rename omap_mpu_state_s variable, (continued)
- [Qemu-devel] [PATCH qom-next 02/22] omap_sx1: Rename omap_mpu_state_s variable, Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 09/22] integratorcp: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 07/22] z2: Rename PXA2xxState variable, Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 18/22] exynos4210: Use cpu_arm_init() to store ARMCPU, Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 15/22] arm_boot: Pass ARMCPU to arm_load_kernel(), Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 11/22] versatilepb: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 05/22] spitz: Rename PXA2xxState variable, Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 13/22] arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot(), Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 08/22] strongarm: Use cpu_arm_init() to store ARMCPU in StrongARMState, Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 22/22] pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo, Andreas Färber, 2012/05/14
- [Qemu-devel] [PATCH qom-next 10/22] musicpal: Use cpu_arm_init() to obtain ARMCPU,
Andreas Färber <=
- Re: [Qemu-devel] [PATCH qom-next 00/22] ARM: QOM cpu_reset() followups, Peter Maydell, 2012/05/15
- Re: [Qemu-devel] [PATCH qom-next 00/22] ARM: QOM cpu_reset() followups, Igor Mitsyanko, 2012/05/16