[Qemu-devel] [PULL for-2.5 0/2] qemu-ga patch queue for 2.5

[Qemu-devel] [PULL for-2.5 0/2] qemu-ga patch queue for 2.5

[Michael Roth]

The following changes since commit 8337c6cbc37c6b2184f41bab3eaff47d5e68012a:

  Update version for v2.5.0-rc0 release (2015-11-13 17:10:36 +0000)

are available in the git repository at:

  git://github.com/mdroth/qemu.git tags/qga-pull-2015-11-13-tag

for you to fetch changes up to 8144e432d8c8e801a906c126afc1333985fad0ce:

  qga: allow to lookup in PATH from the passed envp for guest-exec (2015-11-13 16:31:32 -0600)

----------------------------------------------------------------
qemu-ga patch queue for 2.5

* fixes for guest-exec gspawn() usage:
  - inherit default lookup path by default instead of
    explicitly defining it as being empty.
  - don't inherit default PATH when PATH/ENV are explicit

----------------------------------------------------------------
Yuri Pudgorodskiy (2):
      qga: fix for default env processing for guest-exec
      qga: allow to lookup in PATH from the passed envp for guest-exec

 qga/commands.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

[Qemu-devel] [PULL for-2.5 1/2] qga: fix for default env processing for guest-exec

[Michael Roth]

From: Yuri Pudgorodskiy <yur@virtuozzo.com>

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 <yur@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 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

[Qemu-devel] [PULL for-2.5 2/2] qga: allow to lookup in PATH from the passed envp for guest-exec

[Michael Roth]

From: Yuri Pudgorodskiy <yur@virtuozzo.com>

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>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 qga/commands.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qga/commands.c b/qga/commands.c
index 7644ca0..559f18f 100644
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -400,7 +400,8 @@ GuestExec *qmp_guest_exec(const char *path,
     argv = guest_exec_get_args(&arglist, true);
     envp = has_env ? guest_exec_get_args(env, false) : NULL;
 
-    flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD;
+    flags = G_SPAWN_SEARCH_PATH | G_SPAWN_SEARCH_PATH_FROM_ENVP |
+        G_SPAWN_DO_NOT_REAP_CHILD;
     if (!has_output) {
         flags |= G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL;
     }
-- 
1.9.1

Re: [Qemu-devel] [PULL for-2.5 2/2] qga: allow to lookup in PATH from the passed envp for guest-exec

[Michael Roth]

Quoting Michael Roth (2015-11-13 16:40:04)
> From: Yuri Pudgorodskiy <yur@virtuozzo.com>
> 
> 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>
> Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
>  qga/commands.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/qga/commands.c b/qga/commands.c
> index 7644ca0..559f18f 100644
> --- a/qga/commands.c
> +++ b/qga/commands.c
> @@ -400,7 +400,8 @@ GuestExec *qmp_guest_exec(const char *path,
>      argv = guest_exec_get_args(&arglist, true);
>      envp = has_env ? guest_exec_get_args(env, false) : NULL;
> 
> -    flags = G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD;
> +    flags = G_SPAWN_SEARCH_PATH | G_SPAWN_SEARCH_PATH_FROM_ENVP |

Sorry, just noticed this was only added around 2.33. I'll send updated
PULL that adds a version check.

> +        G_SPAWN_DO_NOT_REAP_CHILD;
>      if (!has_output) {
>          flags |= G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL;
>      }
> -- 
> 1.9.1
> 

Re: [Qemu-devel] [PULL for-2.5 0/2] qemu-ga patch queue for 2.5

[Peter Maydell]

On 13 November 2015 at 22:40, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> The following changes since commit 8337c6cbc37c6b2184f41bab3eaff47d5e68012a:
>
>   Update version for v2.5.0-rc0 release (2015-11-13 17:10:36 +0000)
>
> are available in the git repository at:
>
>   git://github.com/mdroth/qemu.git tags/qga-pull-2015-11-13-tag
>
> for you to fetch changes up to 8144e432d8c8e801a906c126afc1333985fad0ce:
>
>   qga: allow to lookup in PATH from the passed envp for guest-exec (2015-11-13 16:31:32 -0600)
>
> ----------------------------------------------------------------
> qemu-ga patch queue for 2.5
>
> * fixes for guest-exec gspawn() usage:
>   - inherit default lookup path by default instead of
>     explicitly defining it as being empty.
>   - don't inherit default PATH when PATH/ENV are explicit
>
> ----------------------------------------------------------------

Hi. I'm afraid this doesn't build against our minimum supported
glib version:

/Users/pm215/src/qemu-for-merges/qga/commands.c:403:35: error: use of
undeclared identifier 'G_SPAWN_SEARCH_PATH_FROM_ENVP'

Looks like that feature was only added in glib 2.34 or thereabouts.

thanks
-- PMM

Re: [Qemu-devel] [PULL for-2.5 0/2] qemu-ga patch queue for 2.5

[Michael Roth]

Quoting Peter Maydell (2015-11-16 06:09:17)
> On 13 November 2015 at 22:40, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> > The following changes since commit 8337c6cbc37c6b2184f41bab3eaff47d5e68012a:
> >
> >   Update version for v2.5.0-rc0 release (2015-11-13 17:10:36 +0000)
> >
> > are available in the git repository at:
> >
> >   git://github.com/mdroth/qemu.git tags/qga-pull-2015-11-13-tag
> >
> > for you to fetch changes up to 8144e432d8c8e801a906c126afc1333985fad0ce:
> >
> >   qga: allow to lookup in PATH from the passed envp for guest-exec (2015-11-13 16:31:32 -0600)
> >
> > ----------------------------------------------------------------
> > qemu-ga patch queue for 2.5
> >
> > * fixes for guest-exec gspawn() usage:
> >   - inherit default lookup path by default instead of
> >     explicitly defining it as being empty.
> >   - don't inherit default PATH when PATH/ENV are explicit
> >
> > ----------------------------------------------------------------
> 
> Hi. I'm afraid this doesn't build against our minimum supported
> glib version:
> 
> /Users/pm215/src/qemu-for-merges/qga/commands.c:403:35: error: use of
> undeclared identifier 'G_SPAWN_SEARCH_PATH_FROM_ENVP'
> 
> Looks like that feature was only added in glib 2.34 or thereabouts.

Sorry, I noticed this after submitting. I commented on it in response
to patch 2, but probably should've posted a top-level reply.

I've added a version check (it appears to be 2.33.2) in v2, but I'm
trying to get 1 more qga fix ("makefile: fix w32 install target for
qemu-ga") in before resubmitting.

> 
> thanks
> -- PMM
>