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