diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2012-12-28 16:08:23 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2012-12-28 16:08:23 +0000 |
commit | 4de63460ca1639bfb0e465ecdcf95551564bb3d6 (patch) | |
tree | ee44f9fcbbd2c6891e80df6dc3a17483654c34b2 /hw/virtex_ml507.c | |
parent | a2685bcc80f61aa612e0d8cfd91086857ae2942e (diff) | |
parent | 501a7ce7270955be151c442c27620fa7af2f3ce5 (diff) | |
download | qemu-4de63460ca1639bfb0e465ecdcf95551564bb3d6.tar.gz |
Merge branch 'qom-cpu' of git://repo.or.cz/qemu/afaerber
* 'qom-cpu' of git://repo.or.cz/qemu/afaerber:
MAINTAINERS: Include X86CPU in CPU maintenance area
cpu: Move kvm_run into CPUState
cpu: Move kvm_state field into CPUState
ppc_booke: Pass PowerPCCPU to ppc_booke_timers_init()
ppc4xx_devs: Return PowerPCCPU from ppc4xx_init()
ppc_booke: Pass PowerPCCPU to {decr,fit,wdt} timer callbacks
ppc: Pass PowerPCCPU to [h]decr timer callbacks
ppc: Pass PowerPCCPU to [h]decr callbacks
ppc: Pass PowerPCCPU to ppc_set_irq()
kvm: Pass CPUState to kvm_vcpu_ioctl()
kvm: Pass CPUState to kvm_arch_*
cpu: Move kvm_fd into CPUState
qdev-properties.c: Separate core from the code used only by qemu-system-*
qdev: Coding style fixes
cpu: Introduce CPUListState struct
target-alpha: Add support for -cpu ?
target-alpha: Turn CPU definitions into subclasses
target-alpha: Avoid leaking the alarm timer over reset
alpha: Pass AlphaCPU array to Typhoon
target-alpha: Let cpu_alpha_init() return AlphaCPU
Diffstat (limited to 'hw/virtex_ml507.c')
-rw-r--r-- | hw/virtex_ml507.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 5238c7cbd6..78450d7c40 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c @@ -93,7 +93,7 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size, } env = &cpu->env; - ppc_booke_timers_init(env, sysclk, 0/* no flags */); + ppc_booke_timers_init(cpu, sysclk, 0/* no flags */); ppc_dcr_init(env, NULL, NULL); |