diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-10-31 02:41:11 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-12-19 01:01:36 +0100 |
| commit | c92458538f501eda585b4b774c50644aed391a8a (patch) | |
| tree | f808d560f27889dbb807be4598056f55425ad18d /target-alpha/cpu-qom.h | |
| parent | ad6011775a324d7c3e2a8bd824e03c5e576dda48 (diff) | |
| download | qemu-c92458538f501eda585b4b774c50644aed391a8a.tar.gz | |
target-alpha: Avoid leaking the alarm timer over reset
Move the timer from CPUAlphaState to AlphaCPU to avoid the pointer being
zero'ed once we implement reset. Would cause a segfault in
sys_helper.c:helper_set_alarm().
This also simplifies timer initialization in Typhoon.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Richard Henderson <rth@twiddle.net>
Diffstat (limited to 'target-alpha/cpu-qom.h')
| -rw-r--r-- | target-alpha/cpu-qom.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h index 6b4ca6d1d1..98585d5023 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) |