From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56956) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVa2V-0001kG-GZ for qemu-devel@nongnu.org; Wed, 20 Jun 2018 06:08:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVa2U-0001tJ-Ma for qemu-devel@nongnu.org; Wed, 20 Jun 2018 06:08:35 -0400 From: David Hildenbrand Date: Wed, 20 Jun 2018 12:08:22 +0200 Message-Id: <20180620100825.22476-5-david@redhat.com> In-Reply-To: <20180620100825.22476-1-david@redhat.com> References: <20180620100825.22476-1-david@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/7] s390x/tcg: SET CLOCK COMPARATOR can clear CKC interrupts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, Richard Henderson , Alexander Graf , Cornelia Huck , Christian Borntraeger , Thomas Huth , David Hildenbrand Let's stop the timer and delete any pending CKC IRQ before doing anything else. Signed-off-by: David Hildenbrand --- target/s390x/misc_helper.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 6ccbe1fe9a..d5f9f5e1d3 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -158,6 +158,12 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t time) Error *err = NULL; S390TOD tod_base; + /* stop the timer and remove pending CKC IRQs */ + timer_del(env->tod_timer); + qemu_mutex_lock_iothread(); + env->pending_int &= ~INTERRUPT_EXT_CLOCK_COMPARATOR; + qemu_mutex_unlock_iothread(); + if (time == -1ULL) { return; } -- 2.17.1