aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-04 17:20:11 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:44 +0200
commit572747136d20bc7e5e2c5a7c54af4aa44b6f42e2 (patch)
tree6d631a7be5b3d3199644f3af6806863fcf617a99 /hw
parent182fbbf218aab161051c3fbe9d27a9fa45d24064 (diff)
downloadqemu-572747136d20bc7e5e2c5a7c54af4aa44b6f42e2.zip
qemu-572747136d20bc7e5e2c5a7c54af4aa44b6f42e2.tar.gz
qemu-572747136d20bc7e5e2c5a7c54af4aa44b6f42e2.tar.bz2
ppc4xx_devs: Use cpu_ppc_init() to obtain PowerPCCPU
Needed for ppc4xx_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw')
-rw-r--r--hw/ppc4xx_devs.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index 00e36f4..4cefd75 100644
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -51,15 +51,18 @@ CPUPPCState *ppc4xx_init (const char *cpu_model,
clk_setup_t *cpu_clk, clk_setup_t *tb_clk,
uint32_t sysclk)
{
+ PowerPCCPU *cpu;
CPUPPCState *env;
/* init CPUs */
- env = cpu_init(cpu_model);
- if (!env) {
+ cpu = cpu_ppc_init(cpu_model);
+ if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC %s CPU definition\n",
cpu_model);
exit(1);
}
+ env = &cpu->env;
+
cpu_clk->cb = NULL; /* We don't care about CPU clock frequency changes */
cpu_clk->opaque = env;
/* Set time-base frequency to sysclk */