From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlJpP-0007NH-Am for qemu-devel@nongnu.org; Wed, 19 Dec 2012 08:36:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlJpJ-0004TM-9F for qemu-devel@nongnu.org; Wed, 19 Dec 2012 08:36:55 -0500 Received: from cantor2.suse.de ([195.135.220.15]:60374 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlJpJ-0004T4-08 for qemu-devel@nongnu.org; Wed, 19 Dec 2012 08:36:49 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 19 Dec 2012 14:36:19 +0100 Message-Id: <1355924196-19288-4-git-send-email-afaerber@suse.de> In-Reply-To: <1355924196-19288-1-git-send-email-afaerber@suse.de> References: <1355924196-19288-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 03/20] target-alpha: Avoid leaking the alarm timer over reset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson 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=C3=A4rber Acked-by: Richard Henderson --- hw/alpha_typhoon.c | 3 +-- target-alpha/cpu-qom.h | 3 +++ target-alpha/cpu.h | 1 - target-alpha/sys_helper.c | 6 ++++-- 4 Dateien ge=C3=A4ndert, 8 Zeilen hinzugef=C3=BCgt(+), 5 Zeilen entfernt= (-) diff --git a/hw/alpha_typhoon.c b/hw/alpha_typhoon.c index 4cc810f..40b3a47 100644 --- a/hw/alpha_typhoon.c +++ b/hw/alpha_typhoon.c @@ -724,8 +724,7 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **is= a_bus, AlphaCPU *cpu =3D cpus[i]; s->cchip.cpu[i] =3D cpu; if (cpu !=3D NULL) { - CPUAlphaState *env =3D &cpu->env; - env->alarm_timer =3D qemu_new_timer_ns(rtc_clock, + cpu->alarm_timer =3D qemu_new_timer_ns(rtc_clock, typhoon_alarm_timer, (void *)((uintptr_t)s += i)); } diff --git a/target-alpha/cpu-qom.h b/target-alpha/cpu-qom.h index 6b4ca6d..98585d5 100644 --- a/target-alpha/cpu-qom.h +++ b/target-alpha/cpu-qom.h @@ -58,6 +58,9 @@ typedef struct AlphaCPU { /*< public >*/ =20 CPUAlphaState env; + + /* This alarm doesn't exist in real hardware; we wish it did. */ + struct QEMUTimer *alarm_timer; } AlphaCPU; =20 static inline AlphaCPU *alpha_env_get_cpu(CPUAlphaState *env) diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index 32e3777..e1d7715 100644 --- a/target-alpha/cpu.h +++ b/target-alpha/cpu.h @@ -277,7 +277,6 @@ struct CPUAlphaState { #endif =20 /* This alarm doesn't exist in real hardware; we wish it did. */ - struct QEMUTimer *alarm_timer; uint64_t alarm_expire; =20 /* Those resources are used only in QEMU core */ diff --git a/target-alpha/sys_helper.c b/target-alpha/sys_helper.c index 40ca49c..d4f14ef 100644 --- a/target-alpha/sys_helper.c +++ b/target-alpha/sys_helper.c @@ -77,11 +77,13 @@ uint64_t helper_get_time(void) =20 void helper_set_alarm(CPUAlphaState *env, uint64_t expire) { + AlphaCPU *cpu =3D alpha_env_get_cpu(env); + if (expire) { env->alarm_expire =3D 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 */ --=20 1.7.10.4