* [Qemu-devel] [PULL for-2.6 0/2] qemu-ga patch queue for 2.6
@ 2016-04-07 16:53 Michael Roth
2016-04-07 16:53 ` [Qemu-devel] [PULL for-2.6 1/2] qga: fix fd leak with guest-exec i/o channels Michael Roth
2016-04-07 16:53 ` [Qemu-devel] [PULL for-2.6 2/2] qga: Workaround for console redirection from non-interactive qemu-ga service Michael Roth
0 siblings, 2 replies; 3+ messages in thread
From: Michael Roth @ 2016-04-07 16:53 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell
The following changes since commit e380023898479b57d38c0569c02f7bd41090181b:
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging (2016-04-07 12:15:33 +0100)
are available in the git repository at:
git://github.com/mdroth/qemu.git tags/qga-pull-2016-04-07-tag
for you to fetch changes up to 27559c214d9a16d0ef6164d0c3f6fb45833ba2f9:
qga: Workaround for console redirection from non-interactive qemu-ga service (2016-04-07 11:43:54 -0500)
----------------------------------------------------------------
qemu-ga patch queue for 2.6
* fix w32 bug where output from guest-exec is not properly captured
* fix w32 bug where FDs are leaked after guest-exec is invoked
----------------------------------------------------------------
Yuri Pudgorodskiy (1):
qga: Workaround for console redirection from non-interactive qemu-ga service
Yuriy Pudgorodskiy (1):
qga: fix fd leak with guest-exec i/o channels
qga/commands.c | 4 ++++
qga/installer/qemu-ga.wxs | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Qemu-devel] [PULL for-2.6 1/2] qga: fix fd leak with guest-exec i/o channels
2016-04-07 16:53 [Qemu-devel] [PULL for-2.6 0/2] qemu-ga patch queue for 2.6 Michael Roth
@ 2016-04-07 16:53 ` Michael Roth
2016-04-07 16:53 ` [Qemu-devel] [PULL for-2.6 2/2] qga: Workaround for console redirection from non-interactive qemu-ga service Michael Roth
1 sibling, 0 replies; 3+ messages in thread
From: Michael Roth @ 2016-04-07 16:53 UTC (permalink / raw)
To: qemu-devel
Cc: peter.maydell, Yuriy Pudgorodskiy, Michael Roth, Denis V. Lunev
From: Yuriy Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: Yuriy Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
* squashed in g_io_channel_shutdown() to match cleanup paths for
input/output
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
qga/commands.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/qga/commands.c b/qga/commands.c
index 95d8b04..b653a46 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -373,6 +373,7 @@ static gboolean guest_exec_output_watch(GIOChannel *ch,
return true;
close:
+ g_io_channel_shutdown(ch, true, NULL);
g_io_channel_unref(ch);
g_atomic_int_set(&p->closed, 1);
return false;
@@ -447,6 +448,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);
}
@@ -462,6 +464,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,
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Qemu-devel] [PULL for-2.6 2/2] qga: Workaround for console redirection from non-interactive qemu-ga service
2016-04-07 16:53 [Qemu-devel] [PULL for-2.6 0/2] qemu-ga patch queue for 2.6 Michael Roth
2016-04-07 16:53 ` [Qemu-devel] [PULL for-2.6 1/2] qga: fix fd leak with guest-exec i/o channels Michael Roth
@ 2016-04-07 16:53 ` Michael Roth
1 sibling, 0 replies; 3+ messages in thread
From: Michael Roth @ 2016-04-07 16:53 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Yuri Pudgorodskiy, Michael Roth, Denis V. Lunev
From: Yuri Pudgorodskiy <yur@virtuozzo.com>
mingw-glib uses helper process to assist gspawn() api. There are two
versions of helpers, one with main() and another with WinMain() startup
routines.
Whenever gspawn() detects consoleless environment (and qemu-ga is running
in such environment as Win32 service), it chooses helper with main()
instead of WinMain. It is done by name, e.g.
gspawn-win32-helper-console.exe vs gspawn-win32-helper.exe
Running console-aware application like any win32 console apps from main()
crt initalized process results in redirection of stdout to console created
in crt startup instead of parent-provided handle connected to subprocess
pipe. Thus, stdout/stderr redirection do not work correctly.
The patch makes WinMain()'s version of helper be used as the only helper
shipped with qemu-ga package. Using only win32 helper ensures console
is created before any redirection and fixes stdout/stderr redirection
issue.
Signed-off-by: Yuri Pudgorodskiy <yur@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
qga/installer/qemu-ga.wxs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs
index 7f92891..fa2260c 100644
--- a/qga/installer/qemu-ga.wxs
+++ b/qga/installer/qemu-ga.wxs
@@ -96,7 +96,7 @@
<File Id="gspawn-win32-helper-console.exe" Name="gspawn-win32-helper-console.exe" Source="$(var.Mingw_bin)/gspawn-win32-helper-console.exe" KeyPath="yes" DiskId="1"/>
</Component>
<Component Id="gspawn-helper" Guid="{CD67A5A3-2DB1-4DA1-A67A-8D71E797B466}">
- <File Id="gspawn-win32-helper.exe" Name="gspawn-win32-helper.exe" Source="$(var.Mingw_bin)/gspawn-win32-helper.exe" KeyPath="yes" DiskId="1"/>
+ <File Id="gspawn-win32-helper.exe" Name="gspawn-win32-helper.exe" Source="$(var.Mingw_bin)/gspawn-win32-helper-console.exe" KeyPath="yes" DiskId="1"/>
</Component>
<?endif?>
<?if $(var.Arch) = "64"?>
@@ -104,7 +104,7 @@
<File Id="gspawn-win64-helper-console.exe" Name="gspawn-win64-helper-console.exe" Source="$(var.Mingw_bin)/gspawn-win64-helper-console.exe" KeyPath="yes" DiskId="1"/>
</Component>
<Component Id="gspawn-helper" Guid="{D201AD22-1846-4E4F-B6E1-C7A908ED2457}">
- <File Id="gspawn-win64-helper.exe" Name="gspawn-win64-helper.exe" Source="$(var.Mingw_bin)/gspawn-win64-helper.exe" KeyPath="yes" DiskId="1"/>
+ <File Id="gspawn-win64-helper.exe" Name="gspawn-win64-helper.exe" Source="$(var.Mingw_bin)/gspawn-win64-helper-console.exe" KeyPath="yes" DiskId="1"/>
</Component>
<?endif?>
<Component Id="iconv" Guid="{35EE3558-D34B-4F0A-B8BD-430FF0775246}">
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-04-07 16:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-07 16:53 [Qemu-devel] [PULL for-2.6 0/2] qemu-ga patch queue for 2.6 Michael Roth
2016-04-07 16:53 ` [Qemu-devel] [PULL for-2.6 1/2] qga: fix fd leak with guest-exec i/o channels Michael Roth
2016-04-07 16:53 ` [Qemu-devel] [PULL for-2.6 2/2] qga: Workaround for console redirection from non-interactive qemu-ga service Michael Roth
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.