Commit ab9b872a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-11-13-v2-tag' into staging 



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

v2:

* added fix for w32 'make install' target
* added version check for new g_spawn() flag

# gpg: Signature made Tue 17 Nov 2015 22:33:03 GMT using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"

* remotes/mdroth/tags/qga-pull-2015-11-13-v2-tag:
  makefile: fix w32 install target for qemu-ga
  qga: allow to lookup in PATH from the passed envp for guest-exec
  qga: fix for default env processing for guest-exec

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6b79f253 ab59e3ec

Makefile

+4 −1
Original line number Diff line number Diff line
@@ -440,7 +440,10 @@ endif 
install: all $(if $(BUILD_DOCS),install-doc) \

install-datadir install-localstatedir

ifneq ($(TOOLS),)

	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))

	$(call install-prog,$(filter-out qemu-ga,$(TOOLS)),$(DESTDIR)$(bindir))

ifneq (,$(findstring qemu-ga,$(TOOLS)))

	$(call install-prog,qemu-ga$(EXESUF),$(DESTDIR)$(bindir))

endif

endif

ifneq ($(CONFIG_MODULES),)

	$(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)"

qga/commands.c

+4 −1
Original line number Diff line number Diff line
@@ -398,9 +398,12 @@ 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 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;

    }