mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfio-ccw: Connect the device request notifier

Browse Source 
Now that the vfio-ccw code has a notifier interface to request that
a device be unplugged, let's wire that together.

Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20210104202057.48048-4-farman@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Eric Farman 2021-01-04 21:20:57 +01:00 committed by Cornelia Huck
parent b3c818a47f
commit b2f96f9e4f
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/vfio/ccw.c
View File

@ -49,6 +49,7 @@ struct VFIOCCWDevice {
struct ccw_crw_region *crw_region; struct ccw_crw_region *crw_region;
EventNotifier io_notifier; EventNotifier io_notifier;
EventNotifier crw_notifier; EventNotifier crw_notifier;
EventNotifier req_notifier;
bool force_orb_pfch; bool force_orb_pfch;
bool warned_orb_pfch; bool warned_orb_pfch;
}; };
@ -287,6 +288,21 @@ static void vfio_ccw_crw_read(VFIOCCWDevice *vcdev)
} while (1); } while (1);
} }
static void vfio_ccw_req_notifier_handler(void *opaque)
{
VFIOCCWDevice *vcdev = opaque;
Error *err = NULL;
if (!event_notifier_test_and_clear(&vcdev->req_notifier)) {
return;
}
qdev_unplug(DEVICE(vcdev), &err);
if (err) {
warn_reportf_err(err, VFIO_MSG_PREFIX, vcdev->vdev.name);
}
}
static void vfio_ccw_crw_notifier_handler(void *opaque) static void vfio_ccw_crw_notifier_handler(void *opaque)
{ {
VFIOCCWDevice *vcdev = opaque; VFIOCCWDevice *vcdev = opaque;
@ -386,6 +402,10 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,
notifier = &vcdev->crw_notifier; notifier = &vcdev->crw_notifier;
fd_read = vfio_ccw_crw_notifier_handler; fd_read = vfio_ccw_crw_notifier_handler;
break; break;
case VFIO_CCW_REQ_IRQ_INDEX:
notifier = &vcdev->req_notifier;
fd_read = vfio_ccw_req_notifier_handler;
break;
default: default:
error_setg(errp, "vfio: Unsupported device irq(%d)", irq); error_setg(errp, "vfio: Unsupported device irq(%d)", irq);
return; return;
@ -440,6 +460,9 @@ static void vfio_ccw_unregister_irq_notifier(VFIOCCWDevice *vcdev,
case VFIO_CCW_CRW_IRQ_INDEX: case VFIO_CCW_CRW_IRQ_INDEX:
notifier = &vcdev->crw_notifier; notifier = &vcdev->crw_notifier;
break; break;
case VFIO_CCW_REQ_IRQ_INDEX:
notifier = &vcdev->req_notifier;
break;
default: default:
error_report("vfio: Unsupported device irq(%d)", irq); error_report("vfio: Unsupported device irq(%d)", irq);
return; return;
@ -661,20 +684,28 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp)
vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX, &err); vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX, &err);
if (err) { if (err) {
goto out_notifier_err; goto out_io_notifier_err;
} }
if (vcdev->crw_region) { if (vcdev->crw_region) {
vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX, &err); vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX, &err);
if (err) { if (err) {
vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX); goto out_crw_notifier_err;
goto out_notifier_err;
} }
} }
vfio_ccw_register_irq_notifier(vcdev, VFIO_CCW_REQ_IRQ_INDEX, &err);
if (err) {
goto out_req_notifier_err;
}
return; return;
out_notifier_err: out_req_notifier_err:
vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX);
out_crw_notifier_err:
vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX);
out_io_notifier_err:
vfio_ccw_put_region(vcdev); vfio_ccw_put_region(vcdev);
out_region_err: out_region_err:
vfio_ccw_put_device(vcdev); vfio_ccw_put_device(vcdev);
@ -696,6 +727,7 @@ static void vfio_ccw_unrealize(DeviceState *dev)
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;
vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_REQ_IRQ_INDEX);
vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX); vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_CRW_IRQ_INDEX);
vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX); vfio_ccw_unregister_irq_notifier(vcdev, VFIO_CCW_IO_IRQ_INDEX);
vfio_ccw_put_region(vcdev); vfio_ccw_put_region(vcdev);