Commit c9245853 authored Oct 31, 2012 by Andreas Färber

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>

parent ad601177

hw/alpha_typhoon.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -724,8 +724,7 @@ PCIBus typhoon_init(ram_addr_t ram_size, ISABus *isa_bus,
		AlphaCPU *cpu = cpus[i];
		s->cchip.cpu[i] = cpu;
		if (cpu != NULL) {
		CPUAlphaState *env = &cpu->env;
		env->alarm_timer = qemu_new_timer_ns(rtc_clock,
		cpu->alarm_timer = qemu_new_timer_ns(rtc_clock,
		typhoon_alarm_timer,
		(void *)((uintptr_t)s + i));
		}

target-alpha/cpu-qom.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -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)

target-alpha/cpu.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -277,7 +277,6 @@ struct CPUAlphaState {
		#endif

		/* This alarm doesn't exist in real hardware; we wish it did. */
		struct QEMUTimer *alarm_timer;
		uint64_t alarm_expire;

		/* Those resources are used only in QEMU core */

target-alpha/sys_helper.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -77,11 +77,13 @@ uint64_t helper_get_time(void)

		void helper_set_alarm(CPUAlphaState *env, uint64_t expire)
		{
		AlphaCPU *cpu = alpha_env_get_cpu(env);

		if (expire) {
		env->alarm_expire = expire;
		qemu_mod_timer(env->alarm_timer, expire);
		qemu_mod_timer(cpu->alarm_timer, expire);
		} else {
		qemu_del_timer(env->alarm_timer);
		qemu_del_timer(cpu->alarm_timer);
		}
		}
		#endif /* CONFIG_USER_ONLY */