From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1angFs-0001OG-91 for qemu-devel@nongnu.org; Wed, 06 Apr 2016 01:43:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1angFr-0002IH-3g for qemu-devel@nongnu.org; Wed, 06 Apr 2016 01:43:52 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:23254 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1angFq-0002FH-Mh for qemu-devel@nongnu.org; Wed, 06 Apr 2016 01:43:51 -0400 From: "Denis V. Lunev" Date: Wed, 6 Apr 2016 08:43:30 +0300 Message-Id: <1459921411-20723-2-git-send-email-den@openvz.org> In-Reply-To: <1459921411-20723-1-git-send-email-den@openvz.org> References: <1459921411-20723-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 1/2] qga: fix fd leak with guest-exec i/o channels List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: den@openvz.org, Yuriy Pudgorodskiy , Michael Roth From: Yuriy Pudgorodskiy Signed-off-by: Yuriy Pudgorodskiy Signed-off-by: Denis V. Lunev CC: Michael Roth --- qga/commands.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qga/commands.c b/qga/commands.c index e091ee1..9ad2f7d 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -446,6 +446,7 @@ GuestExec *qmp_guest_exec(const char *path, g_io_channel_set_encoding(in_ch, NULL, NULL); g_io_channel_set_buffered(in_ch, false); g_io_channel_set_flags(in_ch, G_IO_FLAG_NONBLOCK, NULL); + g_io_channel_set_close_on_unref(in_ch, true); g_io_add_watch(in_ch, G_IO_OUT, guest_exec_input_watch, &gei->in); } @@ -461,6 +462,8 @@ GuestExec *qmp_guest_exec(const char *path, g_io_channel_set_encoding(err_ch, NULL, NULL); g_io_channel_set_buffered(out_ch, false); g_io_channel_set_buffered(err_ch, false); + g_io_channel_set_close_on_unref(out_ch, true); + g_io_channel_set_close_on_unref(err_ch, true); g_io_add_watch(out_ch, G_IO_IN | G_IO_HUP, guest_exec_output_watch, &gei->out); g_io_add_watch(err_ch, G_IO_IN | G_IO_HUP, -- 2.1.4