summaryrefslogtreecommitdiffstats
path: root/hw/microblaze_boot.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-03-14 01:38:23 +0100
committerAndreas Färber <afaerber@suse.de>2012-03-14 22:20:26 +0100
commitee118507324a597cacef3972fd69ac387c28744e (patch)
treed6c3ac93785671031f9c6384988e2f65dd3278d4 /hw/microblaze_boot.c
parent7927df3a8bd9e501bba91a5897cc0d5ddd470ccd (diff)
downloadhqemu-ee118507324a597cacef3972fd69ac387c28744e.zip
hqemu-ee118507324a597cacef3972fd69ac387c28744e.tar.gz
microblaze hw/: Don't use CPUState
Scripted conversion: for file in hw/microblaze_*.[hc] hw/petalogix_ml605_mmu.c hw/petalogix_s3adsp1800_mmu.c; do sed -i "s/CPUState/CPUMBState/g" $file done Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/microblaze_boot.c')
-rw-r--r--hw/microblaze_boot.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/microblaze_boot.c b/hw/microblaze_boot.c
index 7ce04dc..b4fbb10 100644
--- a/hw/microblaze_boot.c
+++ b/hw/microblaze_boot.c
@@ -35,7 +35,7 @@
static struct
{
- void (*machine_cpu_reset)(CPUState *);
+ void (*machine_cpu_reset)(CPUMBState *);
uint32_t bootstrap_pc;
uint32_t cmdline;
uint32_t fdt;
@@ -43,7 +43,7 @@ static struct
static void main_cpu_reset(void *opaque)
{
- CPUState *env = opaque;
+ CPUMBState *env = opaque;
cpu_state_reset(env);
env->regs[5] = boot_info.cmdline;
@@ -99,9 +99,9 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
return addr - 0x30000000LL;
}
-void microblaze_load_kernel(CPUState *env, target_phys_addr_t ddr_base,
+void microblaze_load_kernel(CPUMBState *env, target_phys_addr_t ddr_base,
uint32_t ramsize, const char *dtb_filename,
- void (*machine_cpu_reset)(CPUState *))
+ void (*machine_cpu_reset)(CPUMBState *))
{
QemuOpts *machine_opts;
OpenPOWER on IntegriCloud