We neglected to clean up pending interrupts and emergency signals;
fix that.
Signed-off-by: Cornelia Huck <coh...@redhat.com>
---
v1->v2:
- rebased on top of my s390-next branch; we can now move the fields
to be reset instead of clearing them manually
Further cleanup possible in a follow-up patch.
---
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 7f5fa1d35b73..e195e5c7c8bb 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.21.0
