From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Janosch Frank <frankja@linux.ibm.com>,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>,
qemu-devel@nongnu.org,
Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org
Subject: [PULL 03/20] s390x: Move diagnose 308 subcodes and rcs into ipl.h
Date: Thu, 30 Apr 2020 11:44:28 +0200 [thread overview]
Message-ID: <20200430094445.25943-4-cohuck@redhat.com> (raw)
In-Reply-To: <20200430094445.25943-1-cohuck@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>
---
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 3e44abe1c651..a5665e6bfde2 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 54e5670b3fd6..8aba6341f948 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.21.1
next prev parent reply other threads:[~2020-04-30 9:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 9:44 [PULL 00/20] first set of s390x patches for 5.1 Cornelia Huck
2020-04-30 9:44 ` [PULL 01/20] virtio-net: fix rsc_ext compat handling Cornelia Huck
2020-04-30 9:44 ` [PULL 02/20] linux-headers: update against Linux 5.7-rc3 Cornelia Huck
2020-04-30 9:44 ` Cornelia Huck [this message]
2020-04-30 9:44 ` [PULL 04/20] s390x: protvirt: Support unpack facility Cornelia Huck
2020-04-30 9:44 ` [PULL 05/20] s390x: protvirt: Add migration blocker Cornelia Huck
2020-04-30 9:44 ` [PULL 06/20] s390x: protvirt: Inhibit balloon when switching to protected mode Cornelia Huck
2020-04-30 9:44 ` [PULL 07/20] s390x: protvirt: KVM intercept changes Cornelia Huck
2020-04-30 9:44 ` [PULL 08/20] s390x: Add SIDA memory ops Cornelia Huck
2020-04-30 9:44 ` [PULL 09/20] s390x: protvirt: Move STSI data over SIDAD Cornelia Huck
2020-04-30 9:44 ` [PULL 10/20] s390x: protvirt: SCLP interpretation Cornelia Huck
2020-04-30 9:44 ` [PULL 11/20] s390x: protvirt: Set guest IPL PSW Cornelia Huck
2020-04-30 9:44 ` [PULL 12/20] s390x: protvirt: Move diag 308 data over SIDA Cornelia Huck
2020-04-30 9:44 ` [PULL 13/20] s390x: protvirt: Disable address checks for PV guest IO emulation Cornelia Huck
2020-04-30 9:44 ` [PULL 14/20] s390x: protvirt: Move IO control structures over SIDA Cornelia Huck
2020-04-30 9:44 ` [PULL 15/20] s390x: protvirt: Handle SIGP store status correctly Cornelia Huck
2020-04-30 9:44 ` [PULL 16/20] docs: system: Add protvirt docs Cornelia Huck
2020-04-30 9:44 ` [PULL 17/20] s390x: Add unpack facility feature to GA1 Cornelia Huck
2020-04-30 9:44 ` [PULL 18/20] s390x: protvirt: Fix stray error_report_err in s390_machine_protect Cornelia Huck
2020-04-30 9:44 ` [PULL 19/20] s390x/pv: Retry ioctls on -EINTR Cornelia Huck
2020-04-30 9:44 ` [PULL 20/20] s390x/s390-virtio-ccw: Fix build on systems without KVM Cornelia Huck
2020-04-30 13:54 ` [PULL 00/20] first set of s390x patches for 5.1 Peter Maydell
2020-04-30 15:36 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200430094445.25943-4-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.