s390/ipl: cast to SCSIDevice directly
PATCH 1/1 s390/ipl: cast to SCSIDevice directly
Coverity notes that the result of object_dynamic_cast() to SCSIDevice is not checked in s390_gen_initial_iplp(); as we know that we always have a SCSIDevice in that branch, we can instead cast via SCSI_DEVICE directly.
Coverity: CID 1401098
--- hw/s390x/ipl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
hw/s390x/ipl.c +1 -2
@@ -374,8 +374,7 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)if (ccw_dev) {switch (devtype) {case CCW_DEVTYPE_SCSI : - sd = (SCSIDevice *)object_dynamic_cast (OBJECT (dev_st), -TYPE_SCSI_DEVICE ); + sd =SCSI_DEVICE (dev_st); ipl->iplb.len =cpu_to_be32 (S390_IPLB_MIN_QEMU_SCSI_LEN ); ipl->iplb.blk0_len =cpu_to_be32 (S390_IPLB_MIN_QEMU_SCSI_LEN -S390_IPLB_HEADER_LEN );
Signature · 1 line
2.17.2
Quoted 18 lines · Cornelia Huck
Coverity notes that the result of
object_dynamic_cast()to SCSIDevice is not checked ins390_gen_initial_iplp(); as we know that we always have a SCSIDevice in that branch, we can instead cast viaSCSI_DEVICEdirectly.Coverity: CID 1401098
Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")Signed-off-by Cornelia Huck <[email protected]>--- hw/s390x/ipl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)hw/s390x/ipl.c +0
-0
hw/s390x/ipl.c static bool s390_gen_initial_iplb(S390IPLState *ipl) · line 380
Quoted 9 lines
hw/s390x/ipl.c +1
-2@@ -374,8 +374,7 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)if (ccw_dev) {switch (devtype) {case CCW_DEVTYPE_SCSI : - sd = (SCSIDevice *)object_dynamic_cast (OBJECT (dev_st), -TYPE_SCSI_DEVICE ); + sd =SCSI_DEVICE (dev_st); ipl->iplb.len =cpu_to_be32 (S390_IPLB_MIN_QEMU_SCSI_LEN ); ipl->iplb.blk0_len =cpu_to_be32 (S390_IPLB_MIN_QEMU_SCSI_LEN -S390_IPLB_HEADER_LEN );
Quoted 18 lines · Cornelia Huck
Coverity notes that the result of
object_dynamic_cast()to SCSIDevice is not checked ins390_gen_initial_iplp(); as we know that we always have a SCSIDevice in that branch, we can instead cast viaSCSI_DEVICEdirectly.Coverity: CID 1401098
Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")Signed-off-by Cornelia Huck <[email protected]>--- hw/s390x/ipl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)hw/s390x/ipl.c +0
-0
hw/s390x/ipl.c static bool s390_gen_initial_iplb(S390IPLState *ipl) · line 380
Quoted 9 lines
hw/s390x/ipl.c +1
-2@@ -374,8 +374,7 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)if (ccw_dev) {switch (devtype) {case CCW_DEVTYPE_SCSI : - sd = (SCSIDevice *)object_dynamic_cast (OBJECT (dev_st), -TYPE_SCSI_DEVICE ); + sd =SCSI_DEVICE (dev_st); ipl->iplb.len =cpu_to_be32 (S390_IPLB_MIN_QEMU_SCSI_LEN ); ipl->iplb.blk0_len =cpu_to_be32 (S390_IPLB_MIN_QEMU_SCSI_LEN -S390_IPLB_HEADER_LEN );
Quoted 5 lines · Cornelia Huck
Coverity notes that the result of
object_dynamic_cast()to SCSIDevice is not checked ins390_gen_initial_iplp(); as we know that we always have a SCSIDevice in that branch, we can instead cast viaSCSI_DEVICEdirectly.
And it even does look nicer.
Quoted 22 lines
Coverity: CID 1401098
Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")Signed-off-by Cornelia Huck <[email protected]>--- hw/s390x/ipl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)hw/s390x/ipl.c +1
-2@@ -374,8 +374,7 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)if (ccw_dev) {switch (devtype) {case CCW_DEVTYPE_SCSI : - sd = (SCSIDevice *)object_dynamic_cast (OBJECT (dev_st), -TYPE_SCSI_DEVICE ); + sd =SCSI_DEVICE (dev_st); ipl->iplb.len =cpu_to_be32 (S390_IPLB_MIN_QEMU_SCSI_LEN ); ipl->iplb.blk0_len =cpu_to_be32 (S390_IPLB_MIN_QEMU_SCSI_LEN -S390_IPLB_HEADER_LEN );
Cornelia Huck
AppliedQuoted 11 lines · On Thu, 2 May 2019 17:55:16 +0200 Cornelia Huck <[email protected]> wrote:
Coverity notes that the result of
object_dynamic_cast()to SCSIDevice is not checked ins390_gen_initial_iplp(); as we know that we always have a SCSIDevice in that branch, we can instead cast viaSCSI_DEVICEdirectly.Coverity: CID 1401098
Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")Signed-off-by Cornelia Huck <[email protected]>--- hw/s390x/ipl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Queued to s390-next.