On 12/01/2019 03:58, Eric Auger wrote:
> We can also use vfio_register_event_notifier() helper in
> vfio_intx_enable_kvm to set the signalling associated to
> VFIO_PCI_INTX_IRQ_INDEX.
>
> Signed-off-by: Eric Auger
> ---
> hw/vfio/pci.c | 38 +++---
> 1 file changed, 7 insertions(+), 31 deletions(-)
>
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index c589a4e666..db0504ca10 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -136,6 +136,9 @@ static int vfio_register_event_notifier(VFIOPCIDevice
> *vdev,
> case VFIO_PCI_ERR_IRQ_INDEX:
> notifier = >err_notifier;
> break;
> +case VFIO_PCI_INTX_IRQ_INDEX:
> +notifier = >intx.interrupt;
> +break;
> default:
> return -EINVAL;
> }
> @@ -351,10 +354,8 @@ static void vfio_intx_update(PCIDevice *pdev)
> static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp)
> {
> uint8_t pin = vfio_pci_read_config(>pdev, PCI_INTERRUPT_PIN, 1);
> -int ret, argsz, retval = 0;
> -struct vfio_irq_set *irq_set;
> -int32_t *pfd;
> Error *err = NULL;
> +int ret;
>
> if (!pin) {
> return 0;
> @@ -376,34 +377,12 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error
> **errp)
> }
> #endif
>
> -ret = event_notifier_init(>intx.interrupt, 0);
> +ret = vfio_register_event_notifier(vdev, VFIO_PCI_INTX_IRQ_INDEX, true,
> + vfio_intx_interrupt, errp);
> if (ret) {
> -error_setg_errno(errp, -ret, "event_notifier_init failed");
> return ret;
> }
>
> -argsz = sizeof(*irq_set) + sizeof(*pfd);
> -
> -irq_set = g_malloc0(argsz);
> -irq_set->argsz = argsz;
> -irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;
> -irq_set->index = VFIO_PCI_INTX_IRQ_INDEX;
> -irq_set->start = 0;
> -irq_set->count = 1;
> -pfd = (int32_t *)_set->data;
> -
> -*pfd = event_notifier_get_fd(>intx.interrupt);
> -qemu_set_fd_handler(*pfd, vfio_intx_interrupt, NULL, vdev);
> -
> -ret = ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set);
> -if (ret) {
> -error_setg_errno(errp, -ret, "failed to setup INTx fd");
> -qemu_set_fd_handler(*pfd, NULL, NULL, vdev);
> -event_notifier_cleanup(>intx.interrupt);
After this change if ioctl(VFIO_DEVICE_SET_IRQS) failed, there will be
no event_notifier_cleanup() called as this new
vfio_register_event_notifier() does not do this either.
> -retval = -errno;
> -goto cleanup;
> -}
> -
> vfio_intx_enable_kvm(vdev, );
> if (err) {
> warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
> @@ -413,10 +392,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error
> **errp)
>
> trace_vfio_intx_enable(vdev->vbasedev.name);
>
> -cleanup:
> -g_free(irq_set);
> -
> -return retval;
> +return 0;
> }
>
> static void vfio_intx_disable(VFIOPCIDevice *vdev)
>
--
Alexey
