| Message ID | 20210408093824.14985-6-lulu@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vhost-vdpa: add support for configure interrupt | expand |
在 2021/4/8 下午5:38, Cindy Lu 写道: > add configure interrupt support for virtio-mmio bus. This > interrupt will working while backend is vhost-vdpa So this is actually the guest notifier of config interrupt for virtio-mmio. Thanks > > Signed-off-by: Cindy Lu <lulu@redhat.com> > --- > hw/virtio/virtio-mmio.c | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c > index 1aa1aaeca4..64b347421b 100644 > --- a/hw/virtio/virtio-mmio.c > +++ b/hw/virtio/virtio-mmio.c > @@ -632,7 +632,26 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign, > > return 0; > } > +static int virtio_mmio_set_config_notifier(DeviceState *d, bool assign) > +{ > + VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d); > + VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); > + VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev); > > + EventNotifier *notifier = virtio_get_config_notifier(vdev); > + int r = 0; > + if (assign) { > + r = event_notifier_init(notifier, 0); > + virtio_set_config_notifier_fd_handler(vdev, true, false); > + } else { > + virtio_set_config_notifier_fd_handler(vdev, false, false); > + event_notifier_cleanup(notifier); > + } > + if (vdc->guest_notifier_mask && vdev->use_guest_notifier_mask) { > + vdc->guest_notifier_mask(vdev, 0, !assign, VIRTIO_CONFIG_VECTOR); > + } > + return r; > +} > static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs, > bool assign) > { > @@ -654,8 +673,15 @@ static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs, > goto assign_error; > } > } > + r = virtio_mmio_set_config_notifier(d, assign); > + if (r < 0) { > + goto config_assign_error; > + } > > return 0; > +config_assign_error: > + assert(assign); > + r = virtio_mmio_set_config_notifier(d, false); > > assign_error: > /* We get here on assignment failure. Recover by undoing for VQs 0 .. n. */
diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index 1aa1aaeca4..64b347421b 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -632,7 +632,26 @@ static int virtio_mmio_set_guest_notifier(DeviceState *d, int n, bool assign, return 0; } +static int virtio_mmio_set_config_notifier(DeviceState *d, bool assign) +{ + VirtIOMMIOProxy *proxy = VIRTIO_MMIO(d); + VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); + VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(vdev); + EventNotifier *notifier = virtio_get_config_notifier(vdev); + int r = 0; + if (assign) { + r = event_notifier_init(notifier, 0); + virtio_set_config_notifier_fd_handler(vdev, true, false); + } else { + virtio_set_config_notifier_fd_handler(vdev, false, false); + event_notifier_cleanup(notifier); + } + if (vdc->guest_notifier_mask && vdev->use_guest_notifier_mask) { + vdc->guest_notifier_mask(vdev, 0, !assign, VIRTIO_CONFIG_VECTOR); + } + return r; +} static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs, bool assign) { @@ -654,8 +673,15 @@ static int virtio_mmio_set_guest_notifiers(DeviceState *d, int nvqs, goto assign_error; } } + r = virtio_mmio_set_config_notifier(d, assign); + if (r < 0) { + goto config_assign_error; + } return 0; +config_assign_error: + assert(assign); + r = virtio_mmio_set_config_notifier(d, false); assign_error: /* We get here on assignment failure. Recover by undoing for VQs 0 .. n. */
add configure interrupt support for virtio-mmio bus. This interrupt will working while backend is vhost-vdpa Signed-off-by: Cindy Lu <lulu@redhat.com> --- hw/virtio/virtio-mmio.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)