aboutsummaryrefslogtreecommitdiff
path: root/target-alpha/cpu-qom.h
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2012-12-28 16:08:23 +0000
committerBlue Swirl <blauwirbel@gmail.com>2012-12-28 16:08:23 +0000
commit4de63460ca1639bfb0e465ecdcf95551564bb3d6 (patch)
treeee44f9fcbbd2c6891e80df6dc3a17483654c34b2 /target-alpha/cpu-qom.h
parenta2685bcc80f61aa612e0d8cfd91086857ae2942e (diff)
parent501a7ce7270955be151c442c27620fa7af2f3ce5 (diff)
downloadqemu-4de63460ca1639bfb0e465ecdcf95551564bb3d6.zip
qemu-4de63460ca1639bfb0e465ecdcf95551564bb3d6.tar.gz
qemu-4de63460ca1639bfb0e465ecdcf95551564bb3d6.tar.bz2
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 'target-alpha/cpu-qom.h')
-rw-r--r--target-alpha/cpu-qom.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h
index f2414f7..16367d2 100644
--- a/target-alpha/cpu-qom.h
+++ b/target-alpha/cpu-qom.h
@@ -58,6 +58,9 @@ typedef struct AlphaCPU {
/*< public >*/
CPUAlphaState env;
+
+ /* This alarm doesn't exist in real hardware; we wish it did. */
+ struct QEMUTimer *alarm_timer;
} AlphaCPU;
static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env)