From afe233642d38207ddb34da8bac4507d88c4c3422 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Fri, 21 Dec 2018 15:39:51 +0100 Subject: [PATCH 07/14] s390x/tcg: SET CLOCK COMPARATOR can clear CKC interrupts RH-Author: David Hildenbrand Message-id: <20181221153957.28183-7-david@redhat.com> Patchwork-id: 83769 O-Subject: [RHEL-7.6.z qemu-kvm-ma PATCH 06/12] s390x/tcg: SET CLOCK COMPARATOR can clear CKC interrupts Bugzilla: 1672920 RH-Acked-by: Cornelia Huck RH-Acked-by: Thomas Huth RH-Acked-by: Laurent Vivier Let's stop the timer and delete any pending CKC IRQ before doing anything else. While at it, add a comment why the check for ckc == -1ULL is needed. Reviewed-by: Thomas Huth Signed-off-by: David Hildenbrand Message-Id: <20180627134410.4901-7-david@redhat.com> Signed-off-by: Cornelia Huck (cherry picked from commit 345f1ab96e8279a537f32ae7447296d23308c7d1) Signed-off-by: David Hildenbrand Signed-off-by: Miroslav Rezanina --- target/s390x/misc_helper.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 4f675c7..cada7af 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -155,6 +155,13 @@ void HELPER(sckc)(CPUS390XState *env, uint64_t time) { S390TODState *td = s390_get_todstate(); + /* 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(); + + /* the tod has to exceed the ckc, this can never happen if ckc is all 1's */ if (time == -1ULL) { return; } -- 1.8.3.1