Skip to contentSkip to conversation

s390/ipl: cast to SCSIDevice directly

PATCH Applied Cornelia Huck 4 participants 5 messages May 2, 2019 – May 3, 2019

lore
Share & tools
lore
#0 lore raw

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

Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")
---
 hw/s390x/ipl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
hw/s390x/ipl.c +1 -2
index d0cc06a05fd0..b93750c14eac 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Cornelia Huck

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

Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")
---
 hw/s390x/ipl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
hw/s390x/ipl.c +0 -0
index d0cc06a05fd0..b93750c14eac 100644

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);
Reviewed-by on v1 1/1
#2 lore raw
In reply to Cornelia Huck
Quoted 18 lines · Cornelia Huck

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

Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")
---
 hw/s390x/ipl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
hw/s390x/ipl.c +0 -0
index d0cc06a05fd0..b93750c14eac 100644

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);
Reviewed-by on v1 1/1
#3 lore raw
In reply to Cornelia Huck
Quoted 5 lines · Cornelia Huck

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.

And it even does look nicer.

Quoted 22 lines

Coverity: CID 1401098

Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")
---
 hw/s390x/ipl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
hw/s390x/ipl.c +1 -2
index d0cc06a05fd0..b93750c14eac 100644
@@ -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);
author Applied
#4 lore raw
In reply to Cornelia Huck
Quoted 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 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

Fixes 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data")
---
 hw/s390x/ipl.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Queued to s390-next.