From: Yuri Pudgorodskiy Date: Wed, 6 Apr 2016 05:43:31 +0000 (+0300) Subject: qga: Workaround for console redirection from non-interactive qemu-ga service X-Git-Tag: v2.6.0-rc2~16^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27559c214d9a16d0ef6164d0c3f6fb45833ba2f9;p=thirdparty%2Fqemu.git qga: Workaround for console redirection from non-interactive qemu-ga service 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 Signed-off-by: Denis V. Lunev CC: Michael Roth Signed-off-by: Michael Roth --- diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index 7f9289122f8..fa2260cafa9 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -96,7 +96,7 @@ - + @@ -104,7 +104,7 @@ - +