From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, famz@redhat.com, zhaoshenglong@huawei.com
Subject: [Qemu-devel] [PATCH] vl: fix resource leak with monitor_fdset_add_fd
Date: Fri, 13 Mar 2015 13:55:34 +0100 [thread overview]
Message-ID: <1426251334-29445-1-git-send-email-pbonzini@redhat.com> (raw)
monitor_fdset_add_fd returns an AddfdInfo struct (used by the QMP
command add_fd). Free it.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
v1->v2: line length [Fam], pass &error_abort [Shannon]
---
vl.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/vl.c b/vl.c
index eba5d4c..9eae8f9 100644
--- a/vl.c
+++ b/vl.c
@@ -1011,6 +1011,7 @@ static int parse_add_fd(QemuOpts *opts, void *opaque)
int fd, dupfd, flags;
int64_t fdset_id;
const char *fd_opaque = NULL;
+ AddfdInfo *fdinfo;
fd = qemu_opt_get_number(opts, "fd", -1);
fdset_id = qemu_opt_get_number(opts, "set", -1);
@@ -1060,8 +1061,10 @@ static int parse_add_fd(QemuOpts *opts, void *opaque)
}
/* add the duplicate fd, and optionally the opaque string, to the fd set */
- monitor_fdset_add_fd(dupfd, true, fdset_id, fd_opaque ? true : false,
- fd_opaque, NULL);
+ fdinfo = monitor_fdset_add_fd(dupfd, true, fdset_id,
+ fd_opaque ? true : false, fd_opaque,
+ &error_abort);
+ g_free(fdinfo);
return 0;
}
--
2.3.0
next reply other threads:[~2015-03-13 12:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-13 12:55 Paolo Bonzini [this message]
2015-03-13 13:56 ` [Qemu-devel] [PATCH] vl: fix resource leak with monitor_fdset_add_fd Eric Blake
2015-03-14 8:08 ` Markus Armbruster
2015-03-14 1:15 ` Shannon Zhao
-- strict thread matches above, loose matches on Subject: below --
2015-03-12 14:57 Paolo Bonzini
2015-03-12 16:42 ` Eric Blake
2015-03-12 23:37 ` Fam Zheng
2015-03-13 3:45 ` Patchew Tool
2015-03-13 5:17 ` Shannon Zhao
2015-03-13 12:53 ` Paolo Bonzini
2015-03-19 8:22 ` Michael Tokarev
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=1426251334-29445-1-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=famz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
--cc=zhaoshenglong@huawei.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).