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

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



qemu-ga patch queue

* add config file dump/load support for qemu-ga
* various w32 build fixes, particularly WRT to msi package creation
* fixes for msi installer
* w32 support for guest-set-user-password

v2:
* replaced g_list_free_full with g_list_foreach to maintain glib 2.22
  compatibility

# gpg: Signature made Tue 01 Sep 2015 19:34:15 BST 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-09-01-v2-tag: (26 commits)
  Makefile: qemu-ga: fix msi target error message
  build: qemu-ga: fix VSS dependencies
  configure: qemu-ga: explicitly enable qemu-ga MSI support when probed
  configure: qemu-ga: move MSI installer probe after qga probe
  qemu-ga: implement win32 guest-set-user-password
  qga: start a man page
  qga: add --dump-conf option
  qga: add an optional qemu-ga.conf system configuration
  qga: free a bit more
  qga: move agent run in a separate function
  qga: fill default options in main()
  qga: move option parsing to separate function
  qga: copy argument strings
  qga: rename 'path' to 'channel_path'
  qga: make split_list() return allocated strings
  qga: move string split in separate function
  qga: use exit() when parsing options
  qga: misc spelling
  configure: qemu-ga: report MSI install support in summary
  qemu-ga: Fixed paths issue with MSI build
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 090d0bfd 15b19ed8

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
*.cp

*.dvi

*.exe

*.msi

*.dll

*.so

*.mo

Makefile

+21 −12
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ LIBS+=-lz $(LIBS_TOOLS) 
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)



ifdef BUILD_DOCS

DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-commands.txt

DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8

DOCS+=qmp-commands.txt

ifdef CONFIG_LINUX

DOCS+=kvm_stat.1

endif
@@ -289,28 +290,27 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) 
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)

$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)



qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a

	$(call LINK, $^)

# we require QGA_VSS_PROVIDER files to be built alongside qemu-ga

# executable since they are shipped together, but we don't want to actually

# link against them

qemu-ga$(EXESUF): $(qga-obj-y) libqemuutil.a libqemustub.a $(QGA_VSS_PROVIDER)

	$(call LINK, $(filter-out $(QGA_VSS_PROVIDER), $^))



ifdef QEMU_GA_MSI_ENABLED

QEMU_GA_MSI=qemu-ga-$(ARCH).msi



msi: ${QEMU_GA_MSI}

msi: $(QEMU_GA_MSI)



$(QEMU_GA_MSI): qemu-ga.exe



ifdef QEMU_GA_MSI_WITH_VSS

$(QEMU_GA_MSI): qga/vss-win32/qga-vss.dll

endif



$(QEMU_GA_MSI): config-host.mak



$(QEMU_GA_MSI):  qga/installer/qemu-ga.wxs

	$(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" \

$(QEMU_GA_MSI):  $(SRC_PATH)/qga/installer/qemu-ga.wxs

	$(call quiet-command,QEMU_GA_VERSION="$(QEMU_GA_VERSION)" QEMU_GA_MANUFACTURER="$(QEMU_GA_MANUFACTURER)" QEMU_GA_DISTRO="$(QEMU_GA_DISTRO)" BUILD_DIR="$(BUILD_DIR)" \

	wixl -o $@ $(QEMU_GA_MSI_ARCH) $(QEMU_GA_MSI_WITH_VSS) $(QEMU_GA_MSI_MINGW_DLL_PATH) $<, "  WIXL  $@")

else

msi:

	@echo MSI build not configured or dependency resolution failed (reconfigure with --enable-guest-agent-msi option)

	@echo "MSI build not configured or dependency resolution failed (reconfigure with --enable-guest-agent-msi option)"

endif



clean:
@@ -400,6 +400,9 @@ ifneq ($(TOOLS),) 
	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8"

	$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"

endif

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

	$(INSTALL_DATA) qemu-ga.8 "$(DESTDIR)$(mandir)/man8"

endif

endif

ifdef CONFIG_VIRTFS

	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
@@ -538,6 +541,12 @@ qemu-nbd.8: qemu-nbd.texi 
	  $(POD2MAN) --section=8 --center=" " --release=" " qemu-nbd.pod > $@, \

	  "  GEN   $@")



qemu-ga.8: qemu-ga.texi

	$(call quiet-command, \

	  perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< qemu-ga.pod && \

	  $(POD2MAN) --section=8 --center=" " --release=" " qemu-ga.pod > $@, \

	  "  GEN   $@")



kvm_stat.1: scripts/kvm/kvm_stat.texi

	$(call quiet-command, \

	  perl -Ww -- $(SRC_PATH)/scripts/texi2pod.pl $< kvm_stat.pod && \
@@ -551,7 +560,7 @@ pdf: qemu-doc.pdf qemu-tech.pdf 


qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \

	qemu-img.texi qemu-nbd.texi qemu-options.texi \

	qemu-monitor.texi qemu-img-cmds.texi

	qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi



ifdef CONFIG_WIN32

configure

+65 −57
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ if test "$mingw32" = "yes" ; then 
  sysconfdir="\${prefix}"

  local_statedir=

  confsuffix=""

  libs_qga="-lws2_32 -lwinmm -lpowrprof -liphlpapi $libs_qga"

  libs_qga="-lws2_32 -lwinmm -lpowrprof -liphlpapi -lnetapi32 $libs_qga"

fi



werror=""
@@ -3851,6 +3851,7 @@ EOF 
    guest_agent_with_vss="yes"

    QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"

    libs_qga="-lole32 -loleaut32 -lshlwapi -luuid -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"

    qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"

  else

    if test "$vss_win32_sdk" != "" ; then

      echo "ERROR: Please download and install Microsoft VSS SDK:"
@@ -3904,58 +3905,6 @@ EOF 
  fi

fi



##########################################

# Guest agent Window MSI  package



if test "$guest_agent" != yes; then

  if test "$guest_agent_msi" = yes; then

    error_exit "MSI guest agent package requires guest agent enabled"

  fi

  guest_agent_msi=no

elif test "$mingw32" != "yes"; then

  if test "$guest_agent_msi" = "yes"; then

    error_exit "MSI guest agent package is available only for MinGW Windows cross-compilation"

  fi

  guest_agent_msi=no

elif ! has wixl; then

  if test "$guest_agent_msi" = "yes"; then

    error_exit "MSI guest agent package requires wixl tool installed ( usually from msitools package )"

  fi

  guest_agent_msi=no

fi



if test "$guest_agent_msi" != "no"; then

  if test "$guest_agent_with_vss" = "yes"; then

    QEMU_GA_MSI_WITH_VSS="-D InstallVss"

  fi



  if test "$QEMU_GA_MANUFACTURER" = ""; then

    QEMU_GA_MANUFACTURER=QEMU

  fi



  if test "$QEMU_GA_DISTRO" = ""; then

    QEMU_GA_DISTRO=Linux

  fi



  if test "$QEMU_GA_VERSION" = ""; then

      QEMU_GA_VERSION=`cat $source_path/VERSION`

  fi



  QEMU_GA_MSI_MINGW_DLL_PATH="-D Mingw_dlls=`$pkg_config --variable=prefix glib-2.0`/bin"

  

  case "$cpu" in

  x86_64)

    QEMU_GA_MSI_ARCH="-a x64 -D Arch=64"

    ;;

  i386)

    QEMU_GA_MSI_ARCH="-D Arch=32"

    ;;

  *)

    error_exit "CPU $cpu not supported for building installation package"

    ;;

  esac

fi



##########################################

# check if we have fdatasync
@@ -4396,12 +4345,12 @@ if test "$softmmu" = yes ; then 
    fi

  fi

fi



# Probe for guest agent support/options



if [ "$guest_agent" != "no" ]; then

  if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" -o "$mingw32" = "yes" ] ; then

      tools="qemu-ga\$(EXESUF) $tools"

      if [ "$mingw32" = "yes" -a "$guest_agent_with_vss" = "yes" ]; then

        tools="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb $tools"

      fi

      guest_agent=yes

  elif [ "$guest_agent" != yes ]; then

      guest_agent=no
@@ -4410,6 +4359,63 @@ if [ "$guest_agent" != "no" ]; then 
  fi

fi



# Guest agent Window MSI  package



if test "$guest_agent" != yes; then

  if test "$guest_agent_msi" = yes; then

    error_exit "MSI guest agent package requires guest agent enabled"

  fi

  guest_agent_msi=no

elif test "$mingw32" != "yes"; then

  if test "$guest_agent_msi" = "yes"; then

    error_exit "MSI guest agent package is available only for MinGW Windows cross-compilation"

  fi

  guest_agent_msi=no

elif ! has wixl; then

  if test "$guest_agent_msi" = "yes"; then

    error_exit "MSI guest agent package requires wixl tool installed ( usually from msitools package )"

  fi

  guest_agent_msi=no

else

  # we support qemu-ga, mingw32, and wixl: default to MSI enabled if it wasn't

  # disabled explicitly

  if test "$guest_agent_msi" != "no"; then

    guest_agent_msi=yes

  fi

fi



if test "$guest_agent_msi" = "yes"; then

  if test "$guest_agent_with_vss" = "yes"; then

    QEMU_GA_MSI_WITH_VSS="-D InstallVss"

  fi



  if test "$QEMU_GA_MANUFACTURER" = ""; then

    QEMU_GA_MANUFACTURER=QEMU

  fi



  if test "$QEMU_GA_DISTRO" = ""; then

    QEMU_GA_DISTRO=Linux

  fi



  if test "$QEMU_GA_VERSION" = ""; then

      QEMU_GA_VERSION=`cat $source_path/VERSION`

  fi



  QEMU_GA_MSI_MINGW_DLL_PATH="-D Mingw_dlls=`$pkg_config --variable=prefix glib-2.0`/bin"



  case "$cpu" in

  x86_64)

    QEMU_GA_MSI_ARCH="-a x64 -D Arch=64"

    ;;

  i386)

    QEMU_GA_MSI_ARCH="-D Arch=32"

    ;;

  *)

    error_exit "CPU $cpu not supported for building installation package"

    ;;

  esac

fi



# Mac OS X ships with a broken assembler

roms=

if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) -a \
@@ -4577,6 +4583,7 @@ echo "libnfs support $libnfs" 
echo "build guest agent $guest_agent"

echo "QGA VSS support   $guest_agent_with_vss"

echo "QGA w32 disk info $guest_agent_ntddscsi"

echo "QGA MSI support   $guest_agent_msi"

echo "seccomp support   $seccomp"

echo "coroutine backend $coroutine"

echo "coroutine pool    $coroutine_pool"
@@ -4651,12 +4658,13 @@ if test "$mingw32" = "yes" ; then 
  echo "CONFIG_PRODUCTVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak

  if test "$guest_agent_with_vss" = "yes" ; then

    echo "CONFIG_QGA_VSS=y" >> $config_host_mak

    echo "QGA_VSS_PROVIDER=$qga_vss_provider" >> $config_host_mak

    echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak

  fi

  if test "$guest_agent_ntddscsi" = "yes" ; then

    echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak

  fi

  if test "$guest_agent_msi" != "no"; then

  if test "$guest_agent_msi" = "yes"; then

    echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak  

    echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $config_host_mak

    echo "QEMU_GA_MSI_WITH_VSS=${QEMU_GA_MSI_WITH_VSS}" >> $config_host_mak

qemu-doc.texi

+6 −0
Original line number Diff line number Diff line
@@ -412,6 +412,7 @@ snapshots. 
* vm_snapshots::              VM snapshots

* qemu_img_invocation::       qemu-img Invocation

* qemu_nbd_invocation::       qemu-nbd Invocation

* qemu_ga_invocation::        qemu-ga Invocation

* disk_images_formats::       Disk image file formats

* host_drives::               Using host drives

* disk_images_fat_images::    Virtual FAT disk images
@@ -505,6 +506,11 @@ state is not saved or restored properly (in particular USB). 


@include qemu-nbd.texi



@node qemu_ga_invocation

@subsection @code{qemu-ga} Invocation



@include qemu-ga.texi



@node disk_images_formats

@subsection Disk image file formats

qemu-ga.texi

0 → 100644
+137 −0
Original line number Diff line number Diff line 
@example

@c man begin SYNOPSIS

usage: qemu-ga [OPTIONS]

@c man end

@end example



@c man begin DESCRIPTION



The QEMU Guest Agent is a daemon intended to be run within virtual

machines. It allows the hypervisor host to perform various operations

in the guest, such as:



@itemize

@item

get information from the guest

@item

set the guest's system time

@item

read/write a file

@item

sync and freeze the filesystems

@item

suspend the guest

@item

reconfigure guest local processors

@item

set user's password

@item

...

@end itemize



qemu-ga will read a system configuration file on startup (located at

q@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining

configuration options on the command line. For the same key, the last

option wins, but the lists accumulate (see below for configuration

file format).



@c man end



@c man begin OPTIONS

@table @option

@item -m, --method=@var{method}

  Transport method: one of @samp{unix-listen}, @samp{virtio-serial}, or

  @samp{isa-serial} (@samp{virtio-serial} is the default).



@item -p, --path=@var{path}

  Device/socket path (the default for virtio-serial is

  @samp{/dev/virtio-ports/org.qemu.guest_agent.0},

  the default for isa-serial is @samp{/dev/ttyS0})



@item -l, --logfile=@var{path}

  Set log file path (default is stderr).



@item -f, --pidfile=@var{path}

  Specify pid file (default is @samp{/var/run/qemu-ga.pid}).



@item -F, --fsfreeze-hook=@var{path}

  Enable fsfreeze hook. Accepts an optional argument that specifies

  script to run on freeze/thaw. Script will be called with

  'freeze'/'thaw' arguments accordingly (default is

  @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do

  not follow -F with a space (for example:

  @samp{-F/var/run/fsfreezehook.sh}).



@item -t, --statedir=@var{path}

  Specify the directory to store state information (absolute paths only,

  default is @samp{/var/run}).



@item -v, --verbose

  Log extra debugging information.



@item -V, --version

  Print version information and exit.



@item -d, --daemon

  Daemonize after startup (detach from terminal).



@item -b, --blacklist=@var{list}

  Comma-separated list of RPCs to disable (no spaces, @samp{?} to list

  available RPCs).



@item -D, --dump-conf

  Dump the configuration in a format compatible with @file{qemu-ga.conf}

  and exit.



@item -h, --help

  Display this help and exit.

@end table



@c man end



@c man begin FILES



The syntax of the @file{qemu-ga.conf} configuration file follows the

Desktop Entry Specification, here is a quick summary: it consists of

groups of key-value pairs, interspersed with comments.



@example

# qemu-ga configuration sample

[general]

daemonize = 0

pidfile = /var/run/qemu-ga.pid

verbose = 0

method = virtio-serial

path = /dev/virtio-ports/org.qemu.guest_agent.0

statedir = /var/run

@end example



The list of keys follows the command line options:

@table @option

@item daemon= boolean

@item method= string

@item path= string

@item logfile= string

@item pidfile= string

@item fsfreeze-hook= string

@item statedir= string

@item verbose= boolean

@item blacklist= string list

@end table



@c man end



@ignore



@setfilename qemu-ga

@settitle QEMU Guest Agent



@c man begin AUTHOR

Michael Roth <mdroth@linux.vnet.ibm.com>

@c man end



@c man begin SEEALSO

qemu(1)

@c man end



@end ignore