[Qemu-commits] [qemu/qemu] 9f3917: qemu-ga: Add .msi files to .gitignore

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9f3917804dfda737650a22c745469809725b3c6e
      
https://github.com/qemu/qemu/commit/9f3917804dfda737650a22c745469809725b3c6e
  Author: Leonid Bloch <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  qemu-ga: Add .msi files to .gitignore

Signed-off-by: Leonid Bloch <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 0a18750f296c85a5a446dc04e1c49cd35ad9e7d5
      
https://github.com/qemu/qemu/commit/0a18750f296c85a5a446dc04e1c49cd35ad9e7d5
  Author: Leonid Bloch <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M Makefile
    M qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  qemu-ga: Two MSI related cosmetic changes

Signed-off-by: Leonid Bloch <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 1d394fb78771f4ca307c6020ff3b041905350f70
      
https://github.com/qemu/qemu/commit/1d394fb78771f4ca307c6020ff3b041905350f70
  Author: Leonid Bloch <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  qemu-ga: Fixed GUID capitalization

For compatibility, all the letters in GUID should be capital.

Signed-off-by: Leonid Bloch <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 8b17ccccb23bcd7554d327f46bf4e07ae6da60c0
      
https://github.com/qemu/qemu/commit/8b17ccccb23bcd7554d327f46bf4e07ae6da60c0
  Author: Leonid Bloch <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  qemu-ga: Minor cosmetic changes to the WXS file

Signed-off-by: Leonid Bloch <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 5e994f94121cdb9c48939cb489e2da646c229a48
      
https://github.com/qemu/qemu/commit/5e994f94121cdb9c48939cb489e2da646c229a48
  Author: Leonid Bloch <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  qemu-ga: Created a separate component for each installed file in the MSI

This is done to follow the recommendations given here: 
https://msdn.microsoft.com/en-us/library/aa368269%28VS.85%29.aspx

Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 848849dddf68630021351f5068de12f5c54ae2f8
      
https://github.com/qemu/qemu/commit/848849dddf68630021351f5068de12f5c54ae2f8
  Author: Leonid Bloch <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  qemu-ga: Prevent QEMU-GA VSS provider from being unregistered on MSI reinstall

Previously, running the .msi would unregister the QEMU GA VSS service if QEMU 
GA was already installed on the machine, and then register it only if QEMU GA 
was NOT previously installed. This behavior caused the service to be registered 
only after the INITIAL installation, and any subsequent run of the .msi (to 
redo, repair, or upgrade the installation) ended in the service being 
unregistered.

Now, the VSS service is still unregistered if QEMU GA is already installed (so 
that a fix or an update could be performed) but then it is registered again (if 
the GA is not being uninstalled) thus finishing the repair/upgrade correctly. 
Additionally, downgrading is now prevented. If a user would like to downgrade a 
version, he/she must uninstall the newer version first.

Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: decdfbd28d754f6ff596c0201ab55e9ff4df5b4e
      
https://github.com/qemu/qemu/commit/decdfbd28d754f6ff596c0201ab55e9ff4df5b4e
  Author: Leonid Bloch <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M Makefile
    M qga/installer/qemu-ga.wxs

  Log Message:
  -----------
  qemu-ga: Fixed paths issue with MSI build

Previously, if building out-of-tree, the MSI build would fail since
it wasn't able to find the needed files.

Signed-off-by: Leonid Bloch <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
* fixed up commit msg formating
Signed-off-by: Michael Roth <address@hidden>


  Commit: 4c875d89cb11f4033012eebd63963ab725f8108e
      
https://github.com/qemu/qemu/commit/4c875d89cb11f4033012eebd63963ab725f8108e
  Author: Michael Roth <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: qemu-ga: report MSI install support in summary

Currently we need to examine config-host.mak to determine whether
options/probes for MSI package generation had desired result. Report
this more prominently in ./configure summary as we do with other
guest agent configure options.

Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 2e2a58e0e49ddb3561b541dc01c3206543b3a1a3
      
https://github.com/qemu/qemu/commit/2e2a58e0e49ddb3561b541dc01c3206543b3a1a3
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/qapi-schema.json

  Log Message:
  -----------
  qga: misc spelling

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: c6c84523cd890e95b946c6a8f264ff54a7d5b930
      
https://github.com/qemu/qemu/commit/c6c84523cd890e95b946c6a8f264ff54a7d5b930
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: use exit() when parsing options

The option parsing is going to be moved to a separate function,
use exit() consistently.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 23b42894b389eccb45ab66da3a3e77d3a8cfc2b6
      
https://github.com/qemu/qemu/commit/23b42894b389eccb45ab66da3a3e77d3a8cfc2b6
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: move string split in separate function

The function is going to be reused in a later patch.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 4bca81ceedb59397f6082777f6ed4b39d456be85
      
https://github.com/qemu/qemu/commit/4bca81ceedb59397f6082777f6ed4b39d456be85
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/commands-posix.c
    M qga/commands-win32.c
    M qga/main.c

  Log Message:
  -----------
  qga: make split_list() return allocated strings

In order to avoid any confusion, let's allocate new strings when
splitting.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 44de156ca7bfaf899745291a0d603d4f7550f5ea
      
https://github.com/qemu/qemu/commit/44de156ca7bfaf899745291a0d603d4f7550f5ea
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: rename 'path' to 'channel_path'

'path' is already a global function, rename the variable since it's
going to be in global scope in a later patch.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 2e38d9903be28493ccd6de4a55e5226e9f07dea9
      
https://github.com/qemu/qemu/commit/2e38d9903be28493ccd6de4a55e5226e9f07dea9
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: copy argument strings

Following patch will return allocated strings, so we must correctly
initialize alloc & free them. The nice side effect is that we no longer
have to check for "fixed_state_dir" to call ga_install_service() with a
NULL state dir. The default values are set after parsing the command
line options.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 7a40669491b344a4fe66a0957fe47d594b808f08
      
https://github.com/qemu/qemu/commit/7a40669491b344a4fe66a0957fe47d594b808f08
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: move option parsing to separate function

Move option parsing out of giant main().

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: ef8be55429b9a6718c7e07ede20391c09be65974
      
https://github.com/qemu/qemu/commit/ef8be55429b9a6718c7e07ede20391c09be65974
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: fill default options in main()

Fill all default options during main(). This is a preparation patch
to allow to dump the configuration.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: e3d3103975112a1ab8a0129a4be1cfe3314bce8b
      
https://github.com/qemu/qemu/commit/e3d3103975112a1ab8a0129a4be1cfe3314bce8b
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: move agent run in a separate function

Once the options are populated, move the running state to
a run_agent() function.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
* fixed up an s/ga_state/s/ artifact causing segfault
* replaced g_list_free_full with g_list_foreach to maintain glib
  2.22 compatibility
Signed-off-by: Michael Roth <address@hidden>


  Commit: d4c8a5d49e514bfeac2040ee5371b4e6a7d8d561
      
https://github.com/qemu/qemu/commit/d4c8a5d49e514bfeac2040ee5371b4e6a7d8d561
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: free a bit more

Now that main() has a single exit point, we can free a few
more allocations.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: e236d060cba8d2d6d26a7e076c895d2a6812dafb
      
https://github.com/qemu/qemu/commit/e236d060cba8d2d6d26a7e076c895d2a6812dafb
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: add an optional qemu-ga.conf system configuration

Learn to configure the agent with a system configuration.

This may simplify command-line handling, especially when the blacklist
is long.

Among the other benefits, this may standardize the configuration of an
init service (instead of distro-specific init keys/files)

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
* removed unecessary keyfile != NULL prior to free
Signed-off-by: Michael Roth <address@hidden>


  Commit: aeadcbb6338ddd8aedbc1473ba7e254623951248
      
https://github.com/qemu/qemu/commit/aeadcbb6338ddd8aedbc1473ba7e254623951248
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M qga/main.c

  Log Message:
  -----------
  qga: add --dump-conf option

This new option allows to review the agent configuration,
and ease the task of writing a configuration file.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
Reviewed-by: Denis V. Lunev <address@hidden>
* removed unecessary keyfile != NULL prior to free
* documented --dump-conf is qemu-ga --help output
Signed-off-by: Michael Roth <address@hidden>


  Commit: 665b5d0dff3b1cc9e9dd6ca84e8fa4070e46ee9f
      
https://github.com/qemu/qemu/commit/665b5d0dff3b1cc9e9dd6ca84e8fa4070e46ee9f
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M Makefile
    M qemu-doc.texi
    A qemu-ga.texi

  Log Message:
  -----------
  qga: start a man page

Add a simple man page for the qemu agent.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
*squashed in review comments from Eric Blake <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 259434b8067e1c61017e9a5b8667b6526b474ff2
      
https://github.com/qemu/qemu/commit/259434b8067e1c61017e9a5b8667b6526b474ff2
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M configure
    M qga/commands-win32.c

  Log Message:
  -----------
  qemu-ga: implement win32 guest-set-user-password

Use NetUserSetInfo() to set the user password.

This function is notoriously known to be problematic for users with EFS
encrypted files. But the alternative, NetUserChangePassword() requires
the old password. Nevertheless, The EFS file should be recovered by
changing back to the old password.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 9d6bc27b7e0e8520f1f91721d9c738e027eeb6c4
      
https://github.com/qemu/qemu/commit/9d6bc27b7e0e8520f1f91721d9c738e027eeb6c4
  Author: Michael Roth <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: qemu-ga: move MSI installer probe after qga probe

MSI probe assumes that qemu-ga support has been probed already, but in
cases where --enable-guest-agent/--disable-guest-agent have not been
passed to configure, qemu-ga support may end up getting enabled later,
as is the case with w32 builds. This leads to MSI probe prematurely
reporting error due to lack of qemu-ga support.

Fix this by moving MSI installer probe after the final qga probes.

Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 1a34904e5b59fd42f238dc50992af1c3a11a458b
      
https://github.com/qemu/qemu/commit/1a34904e5b59fd42f238dc50992af1c3a11a458b
  Author: Michael Roth <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: qemu-ga: explicitly enable qemu-ga MSI support when probed

Currently, if we don't explicitly disable support for MSI installer
via --disable-guest-agent-msi, the configure variable that tracks
the flag, 'guest_agent_msi', never gets set unless one of the probes
fails. Subsequent code then treats this unset value the same as if it
were a "yes" value (via != "no" style checks).

Instead, set the default "yes" value explicitly after the probes, then
make subsequent code expect the values to be set.

This makes it easier to report on whether or not MSI support was
enabled via probe by looking at the ./configure summary.

Signed-off-by: Michael Roth <address@hidden>


  Commit: f33ca81f134a4f528117aafe11bfbd09f8c7fcfc
      
https://github.com/qemu/qemu/commit/f33ca81f134a4f528117aafe11bfbd09f8c7fcfc
  Author: Michael Roth <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M Makefile
    M configure

  Log Message:
  -----------
  build: qemu-ga: fix VSS dependencies

Currently VSS dll/tlb files for use in w32 builds are only built as a
result of having been added to the general 'tools' target alongside
qemu-ga. This is fine for default make target, but if we build
qemu-ga directly via `make qemu-ga.exe`, the VSS files are not
created.

Fix this by moving the VSS dependencies to qemu-ga.exe directly.
With this move we can move the VSS files back out of 'tools',
and drop the extra handling from MSI target in Makefile.

Now we can build qemu-ga MSI package with:
  ./configure ...
  make qemu-ga.exe
  make msi

or simply:
  ./configure ...
  make msi

and no longer need to do a full build beforehand.

Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 15b19ed85fb5464b736ef0ece1edce194de2194a
      
https://github.com/qemu/qemu/commit/15b19ed85fb5464b736ef0ece1edce194de2194a
  Author: Michael Roth <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: qemu-ga: fix msi target error message

'msi' target reports error if we attempt to use it when QEMU hasn't
been ./configure'd to enable it. The parenthesis cause an interpreter
error if we don't enclose the error in quotes.

Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: f8b8091d2779d956011a3fb83ff60dbf7465c71d
      
https://github.com/qemu/qemu/commit/f8b8091d2779d956011a3fb83ff60dbf7465c71d
  Author: Peter Maydell <address@hidden>
  Date:   2015-09-01 (Tue, 01 Sep 2015)

  Changed paths:
    M .gitignore
    M Makefile
    M configure
    M qemu-doc.texi
    A qemu-ga.texi
    M qga/commands-posix.c
    M qga/commands-win32.c
    M qga/installer/qemu-ga.wxs
    M qga/main.c
    M qga/qapi-schema.json

  Log Message:
  -----------
  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 <address@hidden>"
# gpg:                 aka "Michael Roth <address@hidden>"
# gpg:                 aka "Michael Roth <address@hidden>"

* 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: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/090d0bfd9483...f8b8091d2779