From: "Cédric Le Goater" <clg@redhat.com>
To: "Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Eric Farman" <farman@linux.ibm.com>,
"Matthew Rosato" <mjrosato@linux.ibm.com>
Cc: Markus Armbruster <armbru@redhat.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org
Subject: [PATCH v2 3/4] vfio/ccw: Use g_autofree variable in vfio_ccw_register_irq_notifier()
Date: Thu, 25 Apr 2024 11:02:13 +0200 [thread overview]
Message-ID: <20240425090214.400194-4-clg@redhat.com> (raw)
In-Reply-To: <20240425090214.400194-1-clg@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio/ccw.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index 90e4a534371684c08e112364e1537eb8979f73f4..6764388bc47a970329fce2233626ccb8178e0165 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -384,7 +384,7 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,
Error **errp)
{
VFIODevice *vdev = &vcdev->vdev;
- struct vfio_irq_info *irq_info;
+ g_autofree struct vfio_irq_info *irq_info = NULL;
size_t argsz;
int fd;
EventNotifier *notifier;
@@ -421,14 +421,14 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,
if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO,
irq_info) < 0 || irq_info->count < 1) {
error_setg_errno(errp, errno, "vfio: Error getting irq info");
- goto out_free_info;
+ return;
}
if (event_notifier_init(notifier, 0)) {
error_setg_errno(errp, errno,
"vfio: Unable to init event notifier for irq (%d)",
irq);
- goto out_free_info;
+ return;
}
fd = event_notifier_get_fd(notifier);
@@ -439,9 +439,6 @@ static void vfio_ccw_register_irq_notifier(VFIOCCWDevice *vcdev,
qemu_set_fd_handler(fd, NULL, NULL, vcdev);
event_notifier_cleanup(notifier);
}
-
-out_free_info:
- g_free(irq_info);
}
static void vfio_ccw_unregister_irq_notifier(VFIOCCWDevice *vcdev,
--
2.44.0
next prev parent reply other threads:[~2024-04-25 9:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240425090214.400194-1-clg@redhat.com>
2024-04-25 9:02 ` [PATCH v2 1/4] vfio/ap: Use g_autofree variable in vfio_ap_register_irq_notifier() Cédric Le Goater
2024-04-25 10:51 ` Markus Armbruster
2024-04-26 16:19 ` Anthony Krowiak
2024-05-16 16:28 ` Cédric Le Goater
2024-04-25 9:02 ` [PATCH v2 2/4] vfio/ap: Make vfio_ap_register_irq_notifier() return a bool Cédric Le Goater
2024-04-25 10:53 ` Markus Armbruster
2024-04-25 9:02 ` Cédric Le Goater [this message]
2024-04-25 10:54 ` [PATCH v2 3/4] vfio/ccw: Use g_autofree variable in vfio_ccw_register_irq_notifier() Markus Armbruster
2024-04-25 12:31 ` Eric Farman
2024-04-25 9:02 ` [PATCH v2 4/4] vfio/ccw: Make vfio_ccw_register_irq_notifier() return a bool Cédric Le Goater
2024-04-25 10:56 ` Markus Armbruster
2024-04-25 12:55 ` Eric Farman
2024-04-25 15:52 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240425090214.400194-4-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=farman@linux.ibm.com \
--cc=mjrosato@linux.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).