On Wed, 12 Dec 2018 09:11:04 -0500
"Jason J. Herne" <jjhe...@linux.ibm.com> wrote:
> Add bootindex property and iplb data for vfio-ccw devices. This allows us to
> forward boot information into the bios for vfio-ccw devices.
>
> Signed-off-by: Jason J. Herne <jjhe...@linux.ibm.com>
> Acked-by: Halil Pasic <pa...@linux.vnet.ibm.com>
> ---
> hw/s390x/ipl.c | 15 +++++++++++++++
> hw/s390x/s390-ccw.c | 9 +++++++++
> hw/vfio/ccw.c | 13 +------------
> include/hw/s390x/s390-ccw.h | 1 +
> include/hw/s390x/vfio-ccw.h | 38 ++++++++++++++++++++++++++++++++++++++
> roms/SLOF | 2 +-
> 6 files changed, 65 insertions(+), 13 deletions(-)
> create mode 100644 include/hw/s390x/vfio-ccw.h
>
> diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
> index 21f64ad..31592e7 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,13 @@ 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 *vc = (VFIOCCWDevice *)
> + object_dynamic_cast(OBJECT(dev_st), TYPE_VFIO_CCW);
> +
> if (virtio_ccw_dev) {
> ccw_dev = CCW_DEVICE(virtio_ccw_dev);
> + } else if (vc) {
> + ccw_dev = CCW_DEVICE(vc);
Maybe call it "vfio_ccw_dev" instead? But that's definitely bikeshed
territory...
> } else {
> SCSIDevice *sd = (SCSIDevice *)
> object_dynamic_cast(OBJECT(dev_st),
You already pointed out the other problems yourself :)
Otherwise, looks good.
