Message ID | 20190502155516.12415-1-cohuck@redhat.com |
---|---|
State | New |
Headers | show |
Series | s390/ipl: cast to SCSIDevice directly | expand |
On 02/05/2019 17.55, Cornelia Huck 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") > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > hw/s390x/ipl.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index d0cc06a05fd0..b93750c14eac 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -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: Thomas Huth <thuth@redhat.com>
On 5/2/19 5:55 PM, Cornelia Huck 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") > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > hw/s390x/ipl.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index d0cc06a05fd0..b93750c14eac 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -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: Philippe Mathieu-Daudé <philmd@redhat.com>
On 02.05.19 17:55, Cornelia Huck 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. > And it even does look nicer. Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> > Coverity: CID 1401098 > Fixes: 44445d8668f4 ("s390 vfio-ccw: Add bootindex property and IPLB data") > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > hw/s390x/ipl.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c > index d0cc06a05fd0..b93750c14eac 100644 > --- a/hw/s390x/ipl.c > +++ b/hw/s390x/ipl.c > @@ -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); >
On Thu, 2 May 2019 17:55:16 +0200 Cornelia Huck <cohuck@redhat.com> 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") > Signed-off-by: Cornelia Huck <cohuck@redhat.com> > --- > hw/s390x/ipl.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) Queued to s390-next.
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index d0cc06a05fd0..b93750c14eac 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -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);
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") Signed-off-by: Cornelia Huck <cohuck@redhat.com> --- hw/s390x/ipl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)