58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 0c85e86077b42547034ec6e8330a3e61d79b97ee Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Tue, 7 Jul 2020 09:35:32 -0400
|
|
Subject: [PATCH 3/4] s390x/tcg: clear local interrupts on reset normal
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
Message-id: <20200707093532.22456-3-thuth@redhat.com>
|
|
Patchwork-id: 97919
|
|
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH 2/2] s390x/tcg: clear local interrupts on reset normal
|
|
Bugzilla: 1854092
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
RH-Acked-by: David Hildenbrand <david@redhat.com>
|
|
|
|
From: Cornelia Huck <cohuck@redhat.com>
|
|
|
|
We neglected to clean up pending interrupts and emergency signals;
|
|
fix that.
|
|
|
|
Message-Id: <20191206135404.16051-1-cohuck@redhat.com>
|
|
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
(cherry picked from commit bcf88d56efec4ffc153bbe98d11b689a5ebe1a91)
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
target/s390x/cpu.h | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
|
|
index edf8391504..a48e655c4d 100644
|
|
--- a/target/s390x/cpu.h
|
|
+++ b/target/s390x/cpu.h
|
|
@@ -98,10 +98,6 @@ struct CPUS390XState {
|
|
|
|
uint64_t cregs[16]; /* control registers */
|
|
|
|
- int pending_int;
|
|
- uint16_t external_call_addr;
|
|
- DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);
|
|
-
|
|
uint64_t ckc;
|
|
uint64_t cputm;
|
|
uint32_t todpr;
|
|
@@ -117,6 +113,10 @@ struct CPUS390XState {
|
|
struct {} start_normal_reset_fields;
|
|
uint8_t riccb[64]; /* runtime instrumentation control */
|
|
|
|
+ int pending_int;
|
|
+ uint16_t external_call_addr;
|
|
+ DECLARE_BITMAP(emergency_signals, S390_MAX_CPUS);
|
|
+
|
|
/* Fields up to this point are cleared by a CPU reset */
|
|
struct {} end_reset_fields;
|
|
|
|
--
|
|
2.27.0
|
|
|