[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/2] vfio-pci: Use vfio_register_event_notifier
From: |
Alexey Kardashevskiy |
Subject: |
Re: [Qemu-devel] [PATCH 2/2] vfio-pci: Use vfio_register_event_notifier in vfio_intx_enable_kvm |
Date: |
Thu, 17 Jan 2019 14:46:48 +1100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 |
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 <address@hidden>
> ---
> 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 = &vdev->err_notifier;
> break;
> + case VFIO_PCI_INTX_IRQ_INDEX:
> + notifier = &vdev->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(&vdev->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(&vdev->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 *)&irq_set->data;
> -
> - *pfd = event_notifier_get_fd(&vdev->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(&vdev->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, &err);
> 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
- Re: [Qemu-devel] [PATCH 1/2] vfio-pci: Introduce vfio_register_event_notifier helper, (continued)
- Re: [Qemu-devel] [PATCH 1/2] vfio-pci: Introduce vfio_register_event_notifier helper, Alexey Kardashevskiy, 2019/01/16
- Re: [Qemu-devel] [PATCH 1/2] vfio-pci: Introduce vfio_register_event_notifier helper, Cornelia Huck, 2019/01/17
- Re: [Qemu-devel] [PATCH 1/2] vfio-pci: Introduce vfio_register_event_notifier helper, Auger Eric, 2019/01/17
- Re: [Qemu-devel] [PATCH 1/2] vfio-pci: Introduce vfio_register_event_notifier helper, Alexey Kardashevskiy, 2019/01/17
- Re: [Qemu-devel] [PATCH 1/2] vfio-pci: Introduce vfio_register_event_notifier helper, Auger Eric, 2019/01/18
- Re: [Qemu-devel] [PATCH 1/2] vfio-pci: Introduce vfio_register_event_notifier helper, Cornelia Huck, 2019/01/18
[Qemu-devel] [PATCH 2/2] vfio-pci: Use vfio_register_event_notifier in vfio_intx_enable_kvm, Eric Auger, 2019/01/11