Commit 9b39d294 authored by Janosch Frank's avatar Janosch Frank Committed by Cornelia Huck
Browse files

s390x: Move diagnose 308 subcodes and rcs into ipl.h 



They are part of the IPL process, so let's put them into the ipl
header.

Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20200319131921.2367-2-frankja@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent dc6f8d45

hw/s390x/ipl.h

+11 −0
Original line number Diff line number Diff line
@@ -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

target/s390x/diag.c

+0 −11
Original line number Diff line number Diff line
@@ -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)

{