From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4WlB-0000kc-P9 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 11:57:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4WlA-0003JV-9h for qemu-devel@nongnu.org; Mon, 15 Jun 2015 11:57:17 -0400 Received: from hall.aurel32.net ([2001:bc8:30d7:101::1]:47740) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4Wl9-0003Go-TD for qemu-devel@nongnu.org; Mon, 15 Jun 2015 11:57:16 -0400 From: Aurelien Jarno Date: Mon, 15 Jun 2015 17:57:04 +0200 Message-Id: <1434383829-26451-6-git-send-email-aurelien@aurel32.net> In-Reply-To: <1434383829-26451-1-git-send-email-aurelien@aurel32.net> References: <1434383829-26451-1-git-send-email-aurelien@aurel32.net> Subject: [Qemu-devel] [PATCH 05/10] target-s390x: correctly initialize ext interrupt queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexander Graf , Aurelien Jarno , Richard Henderson env->ext_index should be initialized to -1 to mark the external interrupt queue as emtpy. This should not be done in s390_cpu_initfn as all the interrupt fields are later reset to 0 by the memset in s390_cpu_initial_reset or s390_cpu_full_reset. Move the initialization there. Cc: Alexander Graf Cc: Richard Henderson Signed-off-by: Aurelien Jarno --- target-s390x/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 7f17823..c4e8a87 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -117,6 +117,7 @@ static void s390_cpu_initial_reset(CPUState *s) env->cregs[14] = CR14_RESET; env->pfault_token = -1UL; + env->ext_index = -1; /* tininess for underflow is detected before rounding */ set_float_detect_tininess(float_tininess_before_rounding, @@ -146,6 +147,7 @@ static void s390_cpu_full_reset(CPUState *s) env->cregs[14] = CR14_RESET; env->pfault_token = -1UL; + env->ext_index = -1; /* tininess for underflow is detected before rounding */ set_float_detect_tininess(float_tininess_before_rounding, @@ -207,7 +209,6 @@ static void s390_cpu_initfn(Object *obj) s390_cpu_set_state(CPU_STATE_STOPPED, cpu); #endif env->cpu_num = cpu_num++; - env->ext_index = -1; if (tcg_enabled() && !inited) { inited = true; -- 2.1.4