From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35909) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zws3J-0002DX-7v for qemu-devel@nongnu.org; Thu, 12 Nov 2015 08:36:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zws3G-0001xT-Tu for qemu-devel@nongnu.org; Thu, 12 Nov 2015 08:36:37 -0500 Received: from mailhub.sw.ru ([195.214.232.25]:9588 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zws3G-0001wW-HF for qemu-devel@nongnu.org; Thu, 12 Nov 2015 08:36:34 -0500 From: "Denis V. Lunev" Date: Thu, 12 Nov 2015 16:36:20 +0300 Message-Id: <1447335381-5988-2-git-send-email-den@openvz.org> In-Reply-To: <1447335381-5988-1-git-send-email-den@openvz.org> References: <1447335381-5988-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 1/2] qga: fix for default env processing for guest-exec List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Denis V. Lunev" , Yuri Pudgorodskiy , qemu-devel@nongnu.org, Michael Roth From: Yuri Pudgorodskiy envp == NULL must be passed inside gspawn() if it was not passed with the command line. Original code inherits environment from the QGA, which is wrong. Signed-off-by: Yuri Pudgorodskiy Signed-off-by: Denis V. Lunev CC: Michael Roth --- qga/commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/commands.c b/qga/commands.c index 0f80ce6..7644ca0 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -398,7 +398,7 @@ GuestExec *qmp_guest_exec(const char *path, arglist.next = has_arg ? arg : NULL; argv = guest_exec_get_args(&arglist, true); - envp = guest_exec_get_args(has_env ? env : NULL, false); + envp = has_env ? guest_exec_get_args(env, false) : NULL; flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD; if (!has_output) { -- 2.1.4