Revision 5ae93306 hw/highbank.c

b/hw/highbank.c
37 37
/* Board init.  */
38 38
static void highbank_cpu_reset(void *opaque)
39 39
{
40
    CPUState *env = opaque;
40
    CPUARMState *env = opaque;
41 41

  
42 42
    env->cp15.c15_config_base_address = GIC_BASE_ADDR;
43 43
}
44 44

  
45
static void hb_write_secondary(CPUState *env, const struct arm_boot_info *info)
45
static void hb_write_secondary(CPUARMState *env, const struct arm_boot_info *info)
46 46
{
47 47
    int n;
48 48
    uint32_t smpboot[] = {
......
66 66
    rom_add_blob_fixed("smpboot", smpboot, sizeof(smpboot), SMP_BOOT_ADDR);
67 67
}
68 68

  
69
static void hb_reset_secondary(CPUState *env, const struct arm_boot_info *info)
69
static void hb_reset_secondary(CPUARMState *env, const struct arm_boot_info *info)
70 70
{
71 71
    switch (info->nb_cpus) {
72 72
    case 4:
......
196 196
                     const char *kernel_filename, const char *kernel_cmdline,
197 197
                     const char *initrd_filename, const char *cpu_model)
198 198
{
199
    CPUState *env = NULL;
199
    CPUARMState *env = NULL;
200 200
    DeviceState *dev;
201 201
    SysBusDevice *busdev;
202 202
    qemu_irq *irqp;

Also available in: Unified diff