| Message ID | 20200319131921.2367-2-frankja@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | s390x: Protected Virtualization support | expand |
On 19.03.20 14:19, Janosch Frank wrote: > 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> > --- > 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 3e44abe1c651d8a0..a5665e6bfde2e8cf 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 54e5670b3fd6d960..8aba6341f94848e1 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) > { > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index 3e44abe1c651d8a0..a5665e6bfde2e8cf 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 54e5670b3fd6d960..8aba6341f94848e1 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) {