* [Qemu-devel] [PATCH v2] vfio-ccw: use vfio_set_irq_signaling
@ 2019-06-17 10:10 Cornelia Huck
2019-06-17 11:14 ` Auger Eric
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Cornelia Huck @ 2019-06-17 10:10 UTC (permalink / raw)
To: Eric Farman, Farhan Ali; +Cc: Eric Auger, qemu-s390x, Cornelia Huck, qemu-devel
Use the new helper.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
v1->v2:
- Don't go overboard with deleting, and keep the get_irq_info part.
---
hw/vfio/ccw.c | 51 +++++++++++++--------------------------------------
1 file changed, 13 insertions(+), 38 deletions(-)
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index 03a2becb3ec9..a18bbd33b055 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -198,9 +198,8 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp)
{
VFIODevice *vdev = &vcdev->vdev;
struct vfio_irq_info *irq_info;
- struct vfio_irq_set *irq_set;
size_t argsz;
- int32_t *pfd;
+ int fd;
if (vdev->num_irqs < VFIO_CCW_IO_IRQ_INDEX + 1) {
error_setg(errp, "vfio: unexpected number of io irqs %u",
@@ -224,56 +223,32 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp)
goto out_free_info;
}
- 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_CCW_IO_IRQ_INDEX;
- irq_set->start = 0;
- irq_set->count = 1;
- pfd = (int32_t *) &irq_set->data;
-
- *pfd = event_notifier_get_fd(&vcdev->io_notifier);
- qemu_set_fd_handler(*pfd, vfio_ccw_io_notifier_handler, NULL, vcdev);
- if (ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set)) {
- error_setg(errp, "vfio: Failed to set up io notification");
- qemu_set_fd_handler(*pfd, NULL, NULL, vcdev);
+ fd = event_notifier_get_fd(&vcdev->io_notifier);
+ qemu_set_fd_handler(fd, vfio_ccw_io_notifier_handler, NULL, vcdev);
+
+ if (vfio_set_irq_signaling(vdev, VFIO_CCW_IO_IRQ_INDEX, 0,
+ VFIO_IRQ_SET_ACTION_TRIGGER, fd, errp)) {
+ qemu_set_fd_handler(fd, NULL, NULL, vcdev);
event_notifier_cleanup(&vcdev->io_notifier);
}
- g_free(irq_set);
-
out_free_info:
g_free(irq_info);
}
static void vfio_ccw_unregister_io_notifier(VFIOCCWDevice *vcdev)
{
- struct vfio_irq_set *irq_set;
- size_t argsz;
- int32_t *pfd;
-
- 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_CCW_IO_IRQ_INDEX;
- irq_set->start = 0;
- irq_set->count = 1;
- pfd = (int32_t *) &irq_set->data;
- *pfd = -1;
-
- if (ioctl(vcdev->vdev.fd, VFIO_DEVICE_SET_IRQS, irq_set)) {
- error_report("vfio: Failed to de-assign device io fd: %m");
+ Error *err = NULL;
+
+ vfio_set_irq_signaling(&vcdev->vdev, VFIO_CCW_IO_IRQ_INDEX, 0,
+ VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err);
+ if (err) {
+ error_reportf_err(err, VFIO_MSG_PREFIX, vcdev->vdev.name);
}
qemu_set_fd_handler(event_notifier_get_fd(&vcdev->io_notifier),
NULL, NULL, vcdev);
event_notifier_cleanup(&vcdev->io_notifier);
-
- g_free(irq_set);
}
static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] vfio-ccw: use vfio_set_irq_signaling
2019-06-17 10:10 [Qemu-devel] [PATCH v2] vfio-ccw: use vfio_set_irq_signaling Cornelia Huck
@ 2019-06-17 11:14 ` Auger Eric
2019-06-17 11:32 ` Eric Farman
2019-06-17 12:15 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Auger Eric @ 2019-06-17 11:14 UTC (permalink / raw)
To: Cornelia Huck, Eric Farman, Farhan Ali; +Cc: qemu-s390x, qemu-devel
Hi Connie,
On 6/17/19 12:10 PM, Cornelia Huck wrote:
> Use the new helper.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
> ---
> v1->v2:
> - Don't go overboard with deleting, and keep the get_irq_info part.
> ---
> hw/vfio/ccw.c | 51 +++++++++++++--------------------------------------
> 1 file changed, 13 insertions(+), 38 deletions(-)
>
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index 03a2becb3ec9..a18bbd33b055 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -198,9 +198,8 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp)
> {
> VFIODevice *vdev = &vcdev->vdev;
> struct vfio_irq_info *irq_info;
> - struct vfio_irq_set *irq_set;
> size_t argsz;
> - int32_t *pfd;
> + int fd;
>
> if (vdev->num_irqs < VFIO_CCW_IO_IRQ_INDEX + 1) {
> error_setg(errp, "vfio: unexpected number of io irqs %u",
> @@ -224,56 +223,32 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp)
> goto out_free_info;
> }
>
> - 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_CCW_IO_IRQ_INDEX;
> - irq_set->start = 0;
> - irq_set->count = 1;
> - pfd = (int32_t *) &irq_set->data;
> -
> - *pfd = event_notifier_get_fd(&vcdev->io_notifier);
> - qemu_set_fd_handler(*pfd, vfio_ccw_io_notifier_handler, NULL, vcdev);
> - if (ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set)) {
> - error_setg(errp, "vfio: Failed to set up io notification");
> - qemu_set_fd_handler(*pfd, NULL, NULL, vcdev);
> + fd = event_notifier_get_fd(&vcdev->io_notifier);
> + qemu_set_fd_handler(fd, vfio_ccw_io_notifier_handler, NULL, vcdev);
> +
> + if (vfio_set_irq_signaling(vdev, VFIO_CCW_IO_IRQ_INDEX, 0,
> + VFIO_IRQ_SET_ACTION_TRIGGER, fd, errp)) {
> + qemu_set_fd_handler(fd, NULL, NULL, vcdev);
> event_notifier_cleanup(&vcdev->io_notifier);
> }
>
> - g_free(irq_set);
> -
> out_free_info:
> g_free(irq_info);
> }
>
> static void vfio_ccw_unregister_io_notifier(VFIOCCWDevice *vcdev)
> {
> - struct vfio_irq_set *irq_set;
> - size_t argsz;
> - int32_t *pfd;
> -
> - 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_CCW_IO_IRQ_INDEX;
> - irq_set->start = 0;
> - irq_set->count = 1;
> - pfd = (int32_t *) &irq_set->data;
> - *pfd = -1;
> -
> - if (ioctl(vcdev->vdev.fd, VFIO_DEVICE_SET_IRQS, irq_set)) {
> - error_report("vfio: Failed to de-assign device io fd: %m");
> + Error *err = NULL;
> +
> + vfio_set_irq_signaling(&vcdev->vdev, VFIO_CCW_IO_IRQ_INDEX, 0,
> + VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err);
> + if (err) {
> + error_reportf_err(err, VFIO_MSG_PREFIX, vcdev->vdev.name);
> }
>
> qemu_set_fd_handler(event_notifier_get_fd(&vcdev->io_notifier),
> NULL, NULL, vcdev);
> event_notifier_cleanup(&vcdev->io_notifier);
> -
> - g_free(irq_set);
> }
>
> static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] vfio-ccw: use vfio_set_irq_signaling
2019-06-17 10:10 [Qemu-devel] [PATCH v2] vfio-ccw: use vfio_set_irq_signaling Cornelia Huck
2019-06-17 11:14 ` Auger Eric
@ 2019-06-17 11:32 ` Eric Farman
2019-06-17 12:15 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Eric Farman @ 2019-06-17 11:32 UTC (permalink / raw)
To: Cornelia Huck, Farhan Ali; +Cc: Eric Auger, qemu-s390x, qemu-devel
On 6/17/19 6:10 AM, Cornelia Huck wrote:
> Use the new helper.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Nice simplification!
Reviewed-by: Eric Farman <farman@linux.ibm.com>
> ---
> v1->v2:
> - Don't go overboard with deleting, and keep the get_irq_info part.
(Sorry about that. :)
> ---
> hw/vfio/ccw.c | 51 +++++++++++++--------------------------------------
> 1 file changed, 13 insertions(+), 38 deletions(-)
>
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index 03a2becb3ec9..a18bbd33b055 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -198,9 +198,8 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp)
> {
> VFIODevice *vdev = &vcdev->vdev;
> struct vfio_irq_info *irq_info;
> - struct vfio_irq_set *irq_set;
> size_t argsz;
> - int32_t *pfd;
> + int fd;
>
> if (vdev->num_irqs < VFIO_CCW_IO_IRQ_INDEX + 1) {
> error_setg(errp, "vfio: unexpected number of io irqs %u",
> @@ -224,56 +223,32 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp)
> goto out_free_info;
> }
>
> - 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_CCW_IO_IRQ_INDEX;
> - irq_set->start = 0;
> - irq_set->count = 1;
> - pfd = (int32_t *) &irq_set->data;
> -
> - *pfd = event_notifier_get_fd(&vcdev->io_notifier);
> - qemu_set_fd_handler(*pfd, vfio_ccw_io_notifier_handler, NULL, vcdev);
> - if (ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set)) {
> - error_setg(errp, "vfio: Failed to set up io notification");
> - qemu_set_fd_handler(*pfd, NULL, NULL, vcdev);
> + fd = event_notifier_get_fd(&vcdev->io_notifier);
> + qemu_set_fd_handler(fd, vfio_ccw_io_notifier_handler, NULL, vcdev);
> +
> + if (vfio_set_irq_signaling(vdev, VFIO_CCW_IO_IRQ_INDEX, 0,
> + VFIO_IRQ_SET_ACTION_TRIGGER, fd, errp)) {
> + qemu_set_fd_handler(fd, NULL, NULL, vcdev);
> event_notifier_cleanup(&vcdev->io_notifier);
> }
>
> - g_free(irq_set);
> -
> out_free_info:
> g_free(irq_info);
> }
>
> static void vfio_ccw_unregister_io_notifier(VFIOCCWDevice *vcdev)
> {
> - struct vfio_irq_set *irq_set;
> - size_t argsz;
> - int32_t *pfd;
> -
> - 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_CCW_IO_IRQ_INDEX;
> - irq_set->start = 0;
> - irq_set->count = 1;
> - pfd = (int32_t *) &irq_set->data;
> - *pfd = -1;
> -
> - if (ioctl(vcdev->vdev.fd, VFIO_DEVICE_SET_IRQS, irq_set)) {
> - error_report("vfio: Failed to de-assign device io fd: %m");
> + Error *err = NULL;
> +
> + vfio_set_irq_signaling(&vcdev->vdev, VFIO_CCW_IO_IRQ_INDEX, 0,
> + VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err);
> + if (err) {
> + error_reportf_err(err, VFIO_MSG_PREFIX, vcdev->vdev.name);
> }
>
> qemu_set_fd_handler(event_notifier_get_fd(&vcdev->io_notifier),
> NULL, NULL, vcdev);
> event_notifier_cleanup(&vcdev->io_notifier);
> -
> - g_free(irq_set);
> }
>
> static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp)
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v2] vfio-ccw: use vfio_set_irq_signaling
2019-06-17 10:10 [Qemu-devel] [PATCH v2] vfio-ccw: use vfio_set_irq_signaling Cornelia Huck
2019-06-17 11:14 ` Auger Eric
2019-06-17 11:32 ` Eric Farman
@ 2019-06-17 12:15 ` Cornelia Huck
2 siblings, 0 replies; 4+ messages in thread
From: Cornelia Huck @ 2019-06-17 12:15 UTC (permalink / raw)
To: Eric Farman, Farhan Ali; +Cc: Eric Auger, qemu-s390x, qemu-devel
On Mon, 17 Jun 2019 12:10:36 +0200
Cornelia Huck <cohuck@redhat.com> wrote:
> Use the new helper.
>
> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
> ---
> v1->v2:
> - Don't go overboard with deleting, and keep the get_irq_info part.
> ---
> hw/vfio/ccw.c | 51 +++++++++++++--------------------------------------
> 1 file changed, 13 insertions(+), 38 deletions(-)
Queued to s390-next.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-17 12:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-17 10:10 [Qemu-devel] [PATCH v2] vfio-ccw: use vfio_set_irq_signaling Cornelia Huck
2019-06-17 11:14 ` Auger Eric
2019-06-17 11:32 ` Eric Farman
2019-06-17 12:15 ` Cornelia Huck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).