yeahuh / rpms / qemu-kvm

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