[Qemu-commits] [qemu/qemu] 3005c2: qga: fix fd leak with guest-exec i/o channels

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3005c2c2fa2875a3413af97e9db368856d3330fd
      
https://github.com/qemu/qemu/commit/3005c2c2fa2875a3413af97e9db368856d3330fd
  Author: Yuriy Pudgorodskiy <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M qga/commands.c

  Log Message:
  -----------
  qga: fix fd leak with guest-exec i/o channels

Signed-off-by: Yuriy Pudgorodskiy <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Michael Roth <address@hidden>
* squashed in g_io_channel_shutdown() to match cleanup paths for
  input/output
Signed-off-by: Michael Roth <address@hidden>


  Commit: 27559c214d9a16d0ef6164d0c3f6fb45833ba2f9
      
https://github.com/qemu/qemu/commit/27559c214d9a16d0ef6164d0c3f6fb45833ba2f9
  Author: Yuri Pudgorodskiy <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  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 <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: ead5268f2166101f7dde70598c9f538a90afd8ee
      
https://github.com/qemu/qemu/commit/ead5268f2166101f7dde70598c9f538a90afd8ee
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-07 (Thu, 07 Apr 2016)

  Changed paths:
    M qga/commands.c
    M qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-04-07-tag' 
into staging

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

# gpg: Signature made Thu 07 Apr 2016 17:46:21 BST using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <address@hidden>"
# gpg:                 aka "Michael Roth <address@hidden>"
# gpg:                 aka "Michael Roth <address@hidden>"

* remotes/mdroth/tags/qga-pull-2016-04-07-tag:
  qga: Workaround for console redirection from non-interactive qemu-ga service
  qga: fix fd leak with guest-exec i/o channels

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e38002389847...ead5268f2166