yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-s390x-Move-diagnose-308-subcodes-and-rcs-into-ipl.h.patch

77c23f
From c9eee8aeed39976293e0d857039fcf729b821e83 Mon Sep 17 00:00:00 2001
77c23f
From: Thomas Huth <thuth@redhat.com>
77c23f
Date: Fri, 29 May 2020 05:54:03 -0400
77c23f
Subject: [PATCH 21/42] s390x: Move diagnose 308 subcodes and rcs into ipl.h
77c23f
MIME-Version: 1.0
77c23f
Content-Type: text/plain; charset=UTF-8
77c23f
Content-Transfer-Encoding: 8bit
77c23f
77c23f
RH-Author: Thomas Huth <thuth@redhat.com>
77c23f
Message-id: <20200529055420.16855-22-thuth@redhat.com>
77c23f
Patchwork-id: 97032
77c23f
O-Subject: [RHEL-8.3.0 qemu-kvm PATCH v2 21/38] s390x: Move diagnose 308 subcodes and rcs into ipl.h
77c23f
Bugzilla: 1828317
77c23f
RH-Acked-by: Claudio Imbrenda <cimbrend@redhat.com>
77c23f
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
77c23f
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
77c23f
RH-Acked-by: David Hildenbrand <david@redhat.com>
77c23f
77c23f
From: Janosch Frank <frankja@linux.ibm.com>
77c23f
77c23f
They are part of the IPL process, so let's put them into the ipl
77c23f
header.
77c23f
77c23f
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
77c23f
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
77c23f
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
77c23f
Reviewed-by: David Hildenbrand <david@redhat.com>
77c23f
Message-Id: <20200319131921.2367-2-frankja@linux.ibm.com>
77c23f
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
77c23f
(cherry picked from commit 9b39d29470e9dbef24ee842a44ea56bd92b855ea)
77c23f
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
77c23f
---
77c23f
 hw/s390x/ipl.h      | 11 +++++++++++
77c23f
 target/s390x/diag.c | 11 -----------
77c23f
 2 files changed, 11 insertions(+), 11 deletions(-)
77c23f
77c23f
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
77c23f
index 3e44abe1c6..a5665e6bfd 100644
77c23f
--- a/hw/s390x/ipl.h
77c23f
+++ b/hw/s390x/ipl.h
77c23f
@@ -159,6 +159,17 @@ struct S390IPLState {
77c23f
 typedef struct S390IPLState S390IPLState;
77c23f
 QEMU_BUILD_BUG_MSG(offsetof(S390IPLState, iplb) & 3, "alignment of iplb wrong");
77c23f
 
77c23f
+#define DIAG_308_RC_OK              0x0001
77c23f
+#define DIAG_308_RC_NO_CONF         0x0102
77c23f
+#define DIAG_308_RC_INVALID         0x0402
77c23f
+
77c23f
+#define DIAG308_RESET_MOD_CLR       0
77c23f
+#define DIAG308_RESET_LOAD_NORM     1
77c23f
+#define DIAG308_LOAD_CLEAR          3
77c23f
+#define DIAG308_LOAD_NORMAL_DUMP    4
77c23f
+#define DIAG308_SET                 5
77c23f
+#define DIAG308_STORE               6
77c23f
+
77c23f
 #define S390_IPL_TYPE_FCP 0x00
77c23f
 #define S390_IPL_TYPE_CCW 0x02
77c23f
 #define S390_IPL_TYPE_QEMU_SCSI 0xff
77c23f
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
77c23f
index 54e5670b3f..8aba6341f9 100644
77c23f
--- a/target/s390x/diag.c
77c23f
+++ b/target/s390x/diag.c
77c23f
@@ -49,17 +49,6 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
77c23f
     return diag288_class->handle_timer(diag288, func, timeout);
77c23f
 }
77c23f
 
77c23f
-#define DIAG_308_RC_OK              0x0001
77c23f
-#define DIAG_308_RC_NO_CONF         0x0102
77c23f
-#define DIAG_308_RC_INVALID         0x0402
77c23f
-
77c23f
-#define DIAG308_RESET_MOD_CLR       0
77c23f
-#define DIAG308_RESET_LOAD_NORM     1
77c23f
-#define DIAG308_LOAD_CLEAR          3
77c23f
-#define DIAG308_LOAD_NORMAL_DUMP    4
77c23f
-#define DIAG308_SET                 5
77c23f
-#define DIAG308_STORE               6
77c23f
-
77c23f
 static int diag308_parm_check(CPUS390XState *env, uint64_t r1, uint64_t addr,
77c23f
                               uintptr_t ra, bool write)
77c23f
 {
77c23f
-- 
77c23f
2.27.0
77c23f