mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 10:13:56 -06:00
arm hw/: Don't use CPUState
Scripted conversion: for file in hw/arm-misc.h hw/arm_boot.c hw/arm_pic.c hw/armv7m.c hw/exynos4210.h hw/highbank.c hw/integratorcp.c hw/musicpal.c hw/omap.h hw/pxa.h hw/pxa2xx_gpio.c hw/pxa2xx_pic.c hw/realview.c hw/strongarm.h hw/versatilepb.c hw/vexpress.c hw/xilinx_zynq.c ; do sed -i "s/CPUState/CPUARMState/g" $file done Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
8b2aee2959
commit
5ae9330682
17 changed files with 33 additions and 33 deletions
|
@ -37,12 +37,12 @@
|
|||
/* Board init. */
|
||||
static void highbank_cpu_reset(void *opaque)
|
||||
{
|
||||
CPUState *env = opaque;
|
||||
CPUARMState *env = opaque;
|
||||
|
||||
env->cp15.c15_config_base_address = GIC_BASE_ADDR;
|
||||
}
|
||||
|
||||
static void hb_write_secondary(CPUState *env, const struct arm_boot_info *info)
|
||||
static void hb_write_secondary(CPUARMState *env, const struct arm_boot_info *info)
|
||||
{
|
||||
int n;
|
||||
uint32_t smpboot[] = {
|
||||
|
@ -66,7 +66,7 @@ static void hb_write_secondary(CPUState *env, const struct arm_boot_info *info)
|
|||
rom_add_blob_fixed("smpboot", smpboot, sizeof(smpboot), SMP_BOOT_ADDR);
|
||||
}
|
||||
|
||||
static void hb_reset_secondary(CPUState *env, const struct arm_boot_info *info)
|
||||
static void hb_reset_secondary(CPUARMState *env, const struct arm_boot_info *info)
|
||||
{
|
||||
switch (info->nb_cpus) {
|
||||
case 4:
|
||||
|
@ -196,7 +196,7 @@ static void highbank_init(ram_addr_t ram_size,
|
|||
const char *kernel_filename, const char *kernel_cmdline,
|
||||
const char *initrd_filename, const char *cpu_model)
|
||||
{
|
||||
CPUState *env = NULL;
|
||||
CPUARMState *env = NULL;
|
||||
DeviceState *dev;
|
||||
SysBusDevice *busdev;
|
||||
qemu_irq *irqp;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue