OSDN Git Service

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-11-25-v2-tag' into...
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Nov 2015 10:24:18 +0000 (10:24 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Nov 2015 10:24:18 +0000 (10:24 +0000)
commitb8b0ee0ea3d2789d8ee7372b9a173e7952e18087
treeafc5c64f963e57e406d4f32f909b65e0e4fb65c2
parent7ef7ddf37674f7147ef23c311cbc3c37e908c8b0
parent44c6e00c3fd85b9c496bd3e74108ace126813a59
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-11-25-v2-tag' into staging

qemu-ga patch queue for 2.5

* include additional w32 MSI install components needed for
  guest-exec
* fix 'make install' when compiling with --disable-tools
* fix potential data corruption/loss when accessing files
  bi-directionally via guest-file-{read,write}
* explicitly document how integer args for guest-file-seek map to
  SEEK_SET/SEEK_CUR/etc to avoid platform-specific differences

v2:
* fixed missing SoB

# gpg: Signature made Wed 25 Nov 2015 23:58:45 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-25-v2-tag:
  qga: added another non-interactive gspawn() helper file.
  qga: Better mapping of SEEK_* in guest-file-seek
  tests: add file-write-read test
  qga: flush explicitly when needed
  qga: gspawn() console helper to Windows guest agent msi build
  makefile: fix qemu-ga make install for --disable-tools

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>