diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2019-12-04 18:04:47 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-12-14 10:25:50 +0100 |
| commit | bcf88d56efec4ffc153bbe98d11b689a5ebe1a91 (patch) | |
| tree | d2565daba64e040d19d310484c635639101c13e6 | |
| parent | 7dcb1baeaefee577ae73b9569215f426d48b4ffc (diff) | |
| download | focaccia-qemu-bcf88d56efec4ffc153bbe98d11b689a5ebe1a91.tar.gz focaccia-qemu-bcf88d56efec4ffc153bbe98d11b689a5ebe1a91.zip | |
s390x/tcg: clear local interrupts on reset normal
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>
| -rw-r--r-- | target/s390x/cpu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 7e1c18d596..aa829e954c 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; |