From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxN1H-0005AY-Pw for qemu-devel@nongnu.org; Fri, 13 Nov 2015 17:40:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZxN1E-0003Ac-6P for qemu-devel@nongnu.org; Fri, 13 Nov 2015 17:40:35 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:46886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZxN1D-0003AP-TM for qemu-devel@nongnu.org; Fri, 13 Nov 2015 17:40:32 -0500 Received: from localhost by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 13 Nov 2015 15:40:31 -0700 Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id C8B1E6E8045 for ; Fri, 13 Nov 2015 17:28:39 -0500 (EST) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tADMeTgR49742032 for ; Fri, 13 Nov 2015 22:40:29 GMT Received: from d01av03.pok.ibm.com (localhost [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tADMeSCo009322 for ; Fri, 13 Nov 2015 17:40:28 -0500 From: Michael Roth Date: Fri, 13 Nov 2015 16:40:03 -0600 Message-Id: <1447454404-10754-2-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1447454404-10754-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1447454404-10754-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PULL for-2.5 1/2] qga: fix for default env processing for guest-exec List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Yuri Pudgorodskiy , Michael Roth , "Denis V. Lunev" 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 Signed-off-by: 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) { -- 1.9.1