|
@@ -251,8 +251,7 @@ again:
|
|
|
|
|
|
static void vfio_ccw_reset(DeviceState *dev)
|
|
static void vfio_ccw_reset(DeviceState *dev)
|
|
{
|
|
{
|
|
- CcwDevice *ccw_dev = DO_UPCAST(CcwDevice, parent_obj, dev);
|
|
|
|
- S390CCWDevice *cdev = DO_UPCAST(S390CCWDevice, parent_obj, ccw_dev);
|
|
|
|
|
|
+ S390CCWDevice *cdev = S390_CCW_DEVICE(dev);
|
|
VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev);
|
|
VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev);
|
|
|
|
|
|
ioctl(vcdev->vdev.fd, VFIO_DEVICE_RESET);
|
|
ioctl(vcdev->vdev.fd, VFIO_DEVICE_RESET);
|
|
@@ -657,8 +656,7 @@ static VFIOGroup *vfio_ccw_get_group(S390CCWDevice *cdev, Error **errp)
|
|
static void vfio_ccw_realize(DeviceState *dev, Error **errp)
|
|
static void vfio_ccw_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
{
|
|
VFIOGroup *group;
|
|
VFIOGroup *group;
|
|
- CcwDevice *ccw_dev = DO_UPCAST(CcwDevice, parent_obj, dev);
|
|
|
|
- S390CCWDevice *cdev = DO_UPCAST(S390CCWDevice, parent_obj, ccw_dev);
|
|
|
|
|
|
+ S390CCWDevice *cdev = S390_CCW_DEVICE(dev);
|
|
VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev);
|
|
VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev);
|
|
S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev);
|
|
S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev);
|
|
Error *err = NULL;
|
|
Error *err = NULL;
|
|
@@ -729,8 +727,7 @@ out_err_propagate:
|
|
|
|
|
|
static void vfio_ccw_unrealize(DeviceState *dev)
|
|
static void vfio_ccw_unrealize(DeviceState *dev)
|
|
{
|
|
{
|
|
- CcwDevice *ccw_dev = DO_UPCAST(CcwDevice, parent_obj, dev);
|
|
|
|
- S390CCWDevice *cdev = DO_UPCAST(S390CCWDevice, parent_obj, ccw_dev);
|
|
|
|
|
|
+ S390CCWDevice *cdev = S390_CCW_DEVICE(dev);
|
|
VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev);
|
|
VFIOCCWDevice *vcdev = DO_UPCAST(VFIOCCWDevice, cdev, cdev);
|
|
S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev);
|
|
S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev);
|
|
VFIOGroup *group = vcdev->vdev.group;
|
|
VFIOGroup *group = vcdev->vdev.group;
|