[Qemu-commits] [qemu/qemu] a88274: block/gluster: return correct error value

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a882745356b17925b83c93d0b821adba8050236f
      
https://github.com/qemu/qemu/commit/a882745356b17925b83c93d0b821adba8050236f
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M block/gluster.c

  Log Message:
  -----------
  block/gluster: return correct error value

Upon error, gluster will call the aio callback function with a
ret value of -1, with errno set to the proper error value.  If
we set the acb->ret value to the return value in the callback,
that results in every error being EPERM (i.e. 1).  Instead, set
it to the proper error result.

Reviewed-by: Niels de Vos <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>


  Commit: 5d4343e6c2682fb7fe66f1560d1823b5a26e7b2f
      
https://github.com/qemu/qemu/commit/5d4343e6c2682fb7fe66f1560d1823b5a26e7b2f
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M block/gluster.c

  Log Message:
  -----------
  block/gluster: code movement of qemu_gluster_close()

Move qemu_gluster_close() further up in the file, in preparation
for the next patch, to avoid a forward declaration.

Signed-off-by: Jeff Cody <address@hidden>


  Commit: d85fa9eb87ba736d2d5ce342fc35f507c8fe29f2
      
https://github.com/qemu/qemu/commit/d85fa9eb87ba736d2d5ce342fc35f507c8fe29f2
  Author: Jeff Cody <address@hidden>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M block/gluster.c
    M configure

  Log Message:
  -----------
  block/gluster: prevent data loss after i/o error

Upon receiving an I/O error after an fsync, by default gluster will
dump its cache.  However, QEMU will retry the fsync, which is especially
useful when encountering errors such as ENOSPC when using the werror=stop
option.  When using caching with gluster, however, the last written data
will be lost upon encountering ENOSPC.  Using the write-behind-cache
xlator option of 'resync-failed-syncs-after-fsync' should cause gluster
to retain the cached data after a failed fsync, so that ENOSPC and other
transient errors are recoverable.

Unfortunately, we have no way of knowing if the
'resync-failed-syncs-after-fsync' xlator option is supported, so for now
close the fd and set the BDS driver to NULL upon fsync error.

Signed-off-by: Jeff Cody <address@hidden>


  Commit: fb91f30bb9716c391ce0441942fffa601ad99684
      
https://github.com/qemu/qemu/commit/fb91f30bb9716c391ce0441942fffa601ad99684
  Author: Yang Hongyang <address@hidden>
  Date:   2016-04-19 (Tue, 19 Apr 2016)

  Changed paths:
    M tests/Makefile

  Log Message:
  -----------
  qemu-ga: do not run qga test when guest agent disabled

When configure with --disable-guest-agent, make check will fail with:
ERROR:tests/test-qga.c:74:fixture_setup: assertion failed (error == NULL):
 Failed to execute child process "/home/xx/qemu/qemu-ga" (No such file or
directory) (g-exec-error-quark, 8)
make: *** [check-tests/test-qga] Error 1

This check was commented out by bab47d9a75a. I think that was by
mistake, because the commit message of that commit didn't mention
this change.

Signed-off-by: Yang Hongyang <address@hidden>
Cc: Gerd Hoffmann <address@hidden>
Cc: Michael S. Tsirkin <address@hidden>
Cc: Michael Roth <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Michael Roth <address@hidden>
Cc: address@hidden


  Commit: fe98b18b6f8c1324b4940a6a1f1bf8d847c9d569
      
https://github.com/qemu/qemu/commit/fe98b18b6f8c1324b4940a6a1f1bf8d847c9d569
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-20 (Wed, 20 Apr 2016)

  Changed paths:
    M block/gluster.c
    M configure

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into 
staging

# gpg: Signature made Tue 19 Apr 2016 17:28:01 BST using RSA key ID C0DE3057
# gpg: Good signature from "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"
# gpg:                 aka "Jeffrey Cody <address@hidden>"

* remotes/cody/tags/block-pull-request:
  block/gluster: prevent data loss after i/o error
  block/gluster: code movement of qemu_gluster_close()
  block/gluster: return correct error value

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


  Commit: 4113b0532da6c448f8e458b413ebde035234d0ea
      
https://github.com/qemu/qemu/commit/4113b0532da6c448f8e458b413ebde035234d0ea
  Author: Peter Maydell <address@hidden>
  Date:   2016-04-20 (Wed, 20 Apr 2016)

  Changed paths:
    M tests/Makefile

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

qemu-ga patch queue for 2.6

* fixes inadvertant change that unconditionally disables qemu-ga unit test
* fixes make check failures when building with --disable-guest-agent that
  were present visible before the unit test was inadvertantly disabled.

# gpg: Signature made Tue 19 Apr 2016 23:30:09 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-2016-04-19-tag:
  qemu-ga: do not run qga test when guest agent disabled

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


Compare: https://github.com/qemu/qemu/compare/1f7685fafa6b...4113b0532da6