yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-s390x-tcg-clear-local-interrupts-on-reset-normal.patch

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