[Qemu-commits] [qemu/qemu] 68aa26: makefile: fix qemu-ga make install for --disable-t...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 68aa262ad09c81b8b1284340cc0d26b65c605df5
      
https://github.com/qemu/qemu/commit/68aa262ad09c81b8b1284340cc0d26b65c605df5
  Author: Michael Roth <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  makefile: fix qemu-ga make install for --disable-tools

ab59e3e introduced a fix for `make install` on w32 that involved
filtering out qemu-ga from $TOOLS install recipe so that we could
append $(EXESUF) to it before attempting to install the binary
via install-prog function.

install-prog takes a list of binaries to install to a particular
directory. If the list is empty it breaks. We guard against this
by ensuring $TOOLS is not empty prior to calling.

However, ab59e3e introduces extra filtering after this check which
can still result on us attempting to call install-prog with an
empty list of binaries. In particular, this occurs if we
build with the --disable-tools configure option, which results
in qemu-ga being the only member of $TOOLS.

Fix this by doing a simple s/qemu-ga/qemu-ga$(EXESUF)/ pass through
$TOOLS instead of filtering out qemu-ga to handle it seperately.

Reported-by: Steve Ellcey <address@hidden>
Cc: Stefan Weil <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: f2b608ab80a336b0136d35d9b49419a917656d44
      
https://github.com/qemu/qemu/commit/f2b608ab80a336b0136d35d9b49419a917656d44
  Author: Yuri Pudgorodskiy <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

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

  Log Message:
  -----------
  qga: gspawn() console helper to Windows guest agent msi build

This helper, gspawn-win64-helper-console.exe for 64-bit and
gspawn-win32-helper-console.exe for 32-bit environment,
is needed for gspawn() mingw implementation, used by guest-exec command.

Without these files guest-exec command on Windows will not
work with "file not found" diagnostic message.

Signed-off-by: Yuri Pudgorodskiy <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Michael Roth <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 895b00f62a7e86724dc7352d67c7808d37366130
      
https://github.com/qemu/qemu/commit/895b00f62a7e86724dc7352d67c7808d37366130
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M qga/commands-posix.c

  Log Message:
  -----------
  qga: flush explicitly when needed

According to the specification:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/fopen.html

"the application shall ensure that output is not directly followed by
input without an intervening call to fflush() or to a file positioning
function (fseek(), fsetpos(), or rewind()), and input is not directly
followed by output without an intervening call to a file positioning
function, unless the input operation encounters end-of-file."

Without this change, an fwrite() followed by an fread() may lose the
previously written content, as shown in the following test.

Fixes:
https://bugzilla.redhat.com/show_bug.cgi?id=1210246

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
* don't confuse {write,read}() with f{write,read}() in
  commit msg (Laszlo)
Signed-off-by: Michael Roth <address@hidden>


  Commit: 4eaab85cb1c1ba9c575d29921df81d63c7aa35df
      
https://github.com/qemu/qemu/commit/4eaab85cb1c1ba9c575d29921df81d63c7aa35df
  Author: Marc-André Lureau <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M tests/test-qga.c

  Log Message:
  -----------
  tests: add file-write-read test

This test exhibits a POSIX behaviour regarding switching between write
and read. It's undefined result if the application doesn't ensure a
flush between the two operations (with glibc, the flush can be implicit
when the buffer size is relatively small). The previous commit fixes
this test.

Related to:
https://bugzilla.redhat.com/show_bug.cgi?id=1210246

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


  Commit: 0a982b1bf3953dc8640c4d6e619fb1132ebbebc3
      
https://github.com/qemu/qemu/commit/0a982b1bf3953dc8640c4d6e619fb1132ebbebc3
  Author: Eric Blake <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

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

  Log Message:
  -----------
  qga: Better mapping of SEEK_* in guest-file-seek

Exposing OS-specific SEEK_ constants in our qapi was a mistake
(if the host has SEEK_CUR as 1, but the guest has it as 2, then
the semantics are unclear what should happen); if we had a time
machine, we would instead expose only a symbolic enum.  It's too
late to change the fact that we have an integer in qapi, but we
can at least document what mapping we want to enforce for all
qga clients (and luckily, it happens to be the mapping that both
Linux and Windows use); then fix the code to match that mapping.
It also helps us filter out unsupported SEEK_DATA and SEEK_HOLE.

In the future, we may wish to move our QGA_SEEK_* constants into
qga/qapi-schema.json, along with updating the schema to take an
alternate type (either the integer, or the string value of the
enum name) - but that's too much risk during hard freeze.

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


  Commit: 44c6e00c3fd85b9c496bd3e74108ace126813a59
      
https://github.com/qemu/qemu/commit/44c6e00c3fd85b9c496bd3e74108ace126813a59
  Author: Yuri Pudgorodskiy <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

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

  Log Message:
  -----------
  qga: added another non-interactive gspawn() helper file.

With previous commit we added gspawn-win64-helper-console.exe,
required for gspawn() mingw implementation.
Unfortunatly when running as a service without interactive
desktop, gspawn() also requires another helper app.

Added gspawn-win64-helper.exe and gspawn-win32-helper.exe
for corresponding architectures.

Signed-off-by: Yuri Pudgorodskiy <address@hidden>
Signed-off-by: Denis V. Lunev <address@hidden>
CC: Michael Roth <address@hidden>
* remove trailing whitespace
Signed-off-by: Michael Roth <address@hidden>


  Commit: b8b0ee0ea3d2789d8ee7372b9a173e7952e18087
      
https://github.com/qemu/qemu/commit/b8b0ee0ea3d2789d8ee7372b9a173e7952e18087
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

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

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

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


Compare: https://github.com/qemu/qemu/compare/7ef7ddf37674...b8b0ee0ea3d2