From: Yuri Pudgorodskiy <yur@virtuozzo.com>
Date: Thu, 12 Nov 2015 13:36:21 +0000 (+0300)
Subject: qga: allow to lookup in PATH from the passed envp for guest-exec
X-Git-Tag: v2.5.0-rc1~8^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0be40839519215988e207b86bc1638de53567588;p=thirdparty%2Fqemu.git

qga: allow to lookup in PATH from the passed envp for guest-exec

This was original behaviour before GLIB gspawn() rework and we rely on
this behaviour.

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>
* add version check (2.33.2) for G_SPAWN_SEARCH_PATH_FROM_ENVP
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---

diff --git a/qga/commands.c b/qga/commands.c
index 7644ca053a3..bb73e7dfbf2 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -401,6 +401,9 @@ GuestExec *qmp_guest_exec(const char *path,
     envp = has_env ? guest_exec_get_args(env, false) : NULL;
 
     flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD;
+#if GLIB_CHECK_VERSION(2, 33, 2)
+    flags |= G_SPAWN_SEARCH_PATH_FROM_ENVP;
+#endif
     if (!has_output) {
         flags |= G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL;
     }