aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanosch Frank <frankja@linux.ibm.com>2020-03-10 05:09:50 -0400
committerChristian Borntraeger <borntraeger@de.ibm.com>2020-03-10 10:18:20 +0100
commit94c21436e5a89143f8b9cb4d089d1a2f3f4fd377 (patch)
tree6c356ce06d87f81ea44a1596175bf8f1724dfc6d
parent0a01e082a428b921e48b5314881b1f23a7b0fe50 (diff)
downloadqemu-94c21436e5a89143f8b9cb4d089d1a2f3f4fd377.zip
qemu-94c21436e5a89143f8b9cb4d089d1a2f3f4fd377.tar.gz
qemu-94c21436e5a89143f8b9cb4d089d1a2f3f4fd377.tar.bz2
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: Janosch Frank <frankja@linux.ibm.com> Reviewed-by: David Hildenbrand <david@redhat.com> Message-Id: <20200310090950.61172-1-frankja@linux.ibm.com> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-rw-r--r--hw/s390x/ipl.h18
-rw-r--r--target/s390x/diag.c2
2 files changed, 10 insertions, 10 deletions
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index d481310..3e44abe 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -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;
-}
-
-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;
+ 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;
+ }
}
#endif
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index b5aec06..54e5670 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -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;
}