Commit 94c21436 authored by Janosch Frank's avatar Janosch Frank Committed by Christian Borntraeger
Browse files

s390x: ipl: Consolidate iplb validity check into one function 



It's nicer to just call one function than calling a function for each
possible iplb type.

Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20200310090950.61172-1-frankja@linux.ibm.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 0a01e082

hw/s390x/ipl.h

+9 −9
Original line number Diff line number Diff line
@@ -173,16 +173,16 @@ static inline bool iplb_valid_len(IplParameterBlock *iplb) 
    return be32_to_cpu(iplb->len) <= sizeof(IplParameterBlock);

}



static inline bool iplb_valid_ccw(IplParameterBlock *iplb)

static inline bool iplb_valid(IplParameterBlock *iplb)

{

    return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN &&

           iplb->pbt == S390_IPL_TYPE_CCW;

    switch (iplb->pbt) {

    case S390_IPL_TYPE_FCP:

        return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN;

    case S390_IPL_TYPE_CCW:

        return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_CCW_LEN;

    default:

        return false;

    }



static inline bool iplb_valid_fcp(IplParameterBlock *iplb)

{

    return be32_to_cpu(iplb->len) >= S390_IPLB_MIN_FCP_LEN &&

           iplb->pbt == S390_IPL_TYPE_FCP;

}



#endif

target/s390x/diag.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) 


        cpu_physical_memory_read(addr, iplb, be32_to_cpu(iplb->len));



        if (!iplb_valid_ccw(iplb) && !iplb_valid_fcp(iplb)) {

        if (!iplb_valid(iplb)) {

            env->regs[r1 + 1] = DIAG_308_RC_INVALID;

            goto out;

        }