[Qemu-commits] [qemu/qemu] 0b4b49: qga: Support enum names in guest-file-seek

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0b4b49387cce8358783a493004b77c1603b34b5c
      
https://github.com/qemu/qemu/commit/0b4b49387cce8358783a493004b77c1603b34b5c
  Author: Eric Blake <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/commands-posix.c
    M qga/commands-win32.c
    M qga/commands.c
    M qga/guest-agent-core.h
    M qga/qapi-schema.json
    M tests/test-qga.c

  Log Message:
  -----------
  qga: Support enum names in guest-file-seek

Magic constants are a pain to use, especially when we run the
risk that our choice of '1' for QGA_SEEK_CUR might differ from
the host or guest's choice of SEEK_CUR.  Better is to use an
enum value, via a qapi alternate type for back-compatibility.

With this,
 {"command":"guest-file-seek", "arguments":{"handle":1,
  "offset":0, "whence":"cur"}}
becomes a synonym for the older
 {"command":"guest-file-seek", "arguments":{"handle":1,
  "offset":0, "whence":1}}

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


  Commit: 01fdadde8070d5355a2b36b80d07f1f412dc0491
      
https://github.com/qemu/qemu/commit/01fdadde8070d5355a2b36b80d07f1f412dc0491
  Author: Leonid Bloch <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

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

  Log Message:
  -----------
  qemu-ga: Fixed minor version switch issue

With automatically generated GUID, on minor version changes, an error
occurred, stating that there is a problem with the installer.
Now, a notification is shown, warning the user that another version of
this product is already installed, and that configuration or removal of
the existing version is possible through Add/Remove Programs on the
Control Panel (expected behavior).

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


  Commit: a7a173624e66785c6364e9f2f3ae0e7bea44bcb4
      
https://github.com/qemu/qemu/commit/a7a173624e66785c6364e9f2f3ae0e7bea44bcb4
  Author: Gal Hammer <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: implement the guest-get-vcpus for windows

Signed-off-by: Gal Hammer <address@hidden>
Reviewed-by: Michael Roth <address@hidden>
* report rather than assert when VCPU count == 0
* fix up subject: s/set-vcpus/get-vcpus/
Signed-off-by: Michael Roth <address@hidden>


  Commit: 02506e2d545d2f931442c910ab46be2cb6d9f788
      
https://github.com/qemu/qemu/commit/02506e2d545d2f931442c910ab46be2cb6d9f788
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: use more idiomatic qemu-style eol operators

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


  Commit: 6771197dffb214cf9ac5de825bbb24ff5dcc70c2
      
https://github.com/qemu/qemu/commit/6771197dffb214cf9ac5de825bbb24ff5dcc70c2
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: use size_t for wcslen() return value

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


  Commit: 6c6916dac8a146f2e8ee845a2a4e8d459a8689eb
      
https://github.com/qemu/qemu/commit/6c6916dac8a146f2e8ee845a2a4e8d459a8689eb
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: use wide-chars constants for wchar_t comparisons

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


  Commit: 25d943b95703ae45567395db4156b25052ee54c4
      
https://github.com/qemu/qemu/commit/25d943b95703ae45567395db4156b25052ee54c4
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: fix off-by-one length check

Laszlo Ersek said: "The length check is off by one (in the safe direction); it
should be (nchars >= 2). The processing should be active for the wide string
L"\r\n" -- resulting in the empty wide string --, I believe."

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


  Commit: 8021de10131868a8857e64b91cf0a868b76a61d8
      
https://github.com/qemu/qemu/commit/8021de10131868a8857e64b91cf0a868b76a61d8
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/commands-win32.c

  Log Message:
  -----------
  qga: check utf8-to-utf16 conversion

UTF8 to UTF16 conversion can fail for genuine reasons, let's check errors.

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


  Commit: e55eb806dbb97f53794b0c2f86983d34f6696845
      
https://github.com/qemu/qemu/commit/e55eb806dbb97f53794b0c2f86983d34f6696845
  Author: Michael Roth <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/vss-win32.c
    M qga/vss-win32/install.cpp
    M qga/vss-win32/provider.cpp
    M qga/vss-win32/requester.cpp
    M qga/vss-win32/requester.h

  Log Message:
  -----------
  qga: fix w32 breakage due to missing osdep.h includes

requester.h relied on qemu/compiler.h definitions to
handle GCC_FMT_ATTR() stub, but this include was removed as part
of scripted clean-ups via 30456d5:

  all: Clean up includes

under the assumption that all C files would have included it via
qemu/osdep.h at that point. requester.cpp was likely missed
due to C++ files requiring manual/special handling as well as
VSS build options needing to be enabled to trigger build failures.

Fix this by including qemu/osdep.h. That in turn pulls in a
macro from qapi/error.h that conflicts with a struct field name
in requester.h, so fix that as well by renaming the field.

While we're at it, fix up provider.cpp/install.cpp to include
osdep.h as well.

Cc: Peter Maydell <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 67ef811ed1452efe9d60c4baa20c8ef6ea0cfe87
      
https://github.com/qemu/qemu/commit/67ef811ed1452efe9d60c4baa20c8ef6ea0cfe87
  Author: Peter Maydell <address@hidden>
  Date:   2016-02-25 (Thu, 25 Feb 2016)

  Changed paths:
    M qga/commands-posix.c
    M qga/commands-win32.c
    M qga/commands.c
    M qga/guest-agent-core.h
    M qga/installer/qemu-ga.wxs
    M qga/qapi-schema.json
    M qga/vss-win32.c
    M qga/vss-win32/install.cpp
    M qga/vss-win32/provider.cpp
    M qga/vss-win32/requester.cpp
    M qga/vss-win32/requester.h
    M tests/test-qga.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-02-25-tag' 
into staging

qemu-ga patch queue for 2.6

* fix w32 build breakage when VSS enabled
* fix up wchar handling in guest-set-user-password
* fix re-install handling for w32 MSI installer
* add w32 support for guest-get-vcpus
* add support for enums in guest-file-seek SEEK params
  instead of relying on platform-specific integer values

# gpg: Signature made Thu 25 Feb 2016 16:59:13 GMT 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-2016-02-25-tag:
  qga: fix w32 breakage due to missing osdep.h includes
  qga: check utf8-to-utf16 conversion
  qga: fix off-by-one length check
  qga: use wide-chars constants for wchar_t comparisons
  qga: use size_t for wcslen() return value
  qga: use more idiomatic qemu-style eol operators
  qga: implement the guest-get-vcpus for windows
  qemu-ga: Fixed minor version switch issue
  qga: Support enum names in guest-file-seek

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/0c6940d086f3...67ef811ed145