Re: [qemu-s390x] [PATCH 01/15] s390 vfio-ccw: Add bootindex property and IPLB data

[Jason J. Herne]

On 1/30/19 5:21 PM, Farhan Ali wrote:
> > ...
> > diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> > index 21f64ad..a993f65 100644
> > --- a/hw/s390x/ipl.c
> > +++ b/hw/s390x/ipl.c
> > @@ -19,6 +19,7 @@
> >   #include "hw/loader.h"
> >   #include "hw/boards.h"
> >   #include "hw/s390x/virtio-ccw.h"
> > +#include "hw/s390x/vfio-ccw.h"
> >   #include "hw/s390x/css.h"
> >   #include "hw/s390x/ebcdic.h"
> >   #include "ipl.h"
> > @@ -311,8 +312,12 @@ static CcwDevice *s390_get_ccw_device(DeviceState *dev_st)
> >           VirtioCcwDevice *virtio_ccw_dev = (VirtioCcwDevice *)
> >               object_dynamic_cast(OBJECT(qdev_get_parent_bus(dev_st)->parent),
> >                                   TYPE_VIRTIO_CCW_DEVICE);
> > +        VFIOCCWDevice *vfio_ccw_dev = (VFIOCCWDevice *)
> > +            object_dynamic_cast(OBJECT(dev_st), TYPE_VFIO_CCW);
> >           if (virtio_ccw_dev) {
> >               ccw_dev = CCW_DEVICE(virtio_ccw_dev);
> > +        } else if (vfio_ccw_dev) {
> > +            ccw_dev = CCW_DEVICE(vfio_ccw_dev);
> >           } else {
> >               SCSIDevice *sd = (SCSIDevice *)
> >                   object_dynamic_cast(OBJECT(dev_st),
> > @@ -347,6 +352,8 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
> >       if (ccw_dev) {
> >           SCSIDevice *sd = (SCSIDevice *) object_dynamic_cast(OBJECT(dev_st),
> >                                                               TYPE_SCSI_DEVICE);
> > +        VFIOCCWDevice *vc = (VFIOCCWDevice *)
> > +            object_dynamic_cast(OBJECT(dev_st), TYPE_VFIO_CCW);
> >           if (sd) {
> >               ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_QEMU_SCSI_LEN);
> > @@ -358,6 +365,13 @@ static bool s390_gen_initial_iplb(S390IPLState *ipl)
> >               ipl->iplb.scsi.channel = cpu_to_be16(sd->channel);
> >               ipl->iplb.scsi.devno = cpu_to_be16(ccw_dev->sch->devno);
> >               ipl->iplb.scsi.ssid = ccw_dev->sch->ssid & 3;
> > +        } else if (vc) {
> > +            CcwDevice *ccw_dev = CCW_DEVICE(vc);
>
> Do we need this line here? I though ccw_dev was already correctly casted in 
> s390_get_ccw_device?
>
> > +
> > +            ipl->iplb.len = cpu_to_be32(S390_IPLB_MIN_CCW_LEN);
> > +            ipl->iplb.pbt = S390_IPL_TYPE_CCW;
> > +            ipl->iplb.ccw.devno = cpu_to_be16(ccw_dev->sch->devno);
> > +            ipl->iplb.ccw.ssid = ccw_dev->sch->ssid & 3;
> >           } else {
> >               VirtIONet *vn = (VirtIONet *) object_dynamic_cast(OBJECT(dev_st),
> >                                                                 
> > TYPE_VIRTIO_NET);

Good catch, we don't need the extra cast. This is a relic of an older way of handling the 
data. I should have removed it when I simplified the code after the RFC version.

--
-- Jason J. Herne (address@hidden)