[Qemu-commits] [qemu/qemu] 5a8a30: block: Add error handling to bdrv_invalidate_cache...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5a8a30db4771675480829d7d3bf35a138e9c35f1
      
https://github.com/qemu/qemu/commit/5a8a30db4771675480829d7d3bf35a138e9c35f1
  Author: Kevin Wolf <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M block.c
    M block/qcow2.c
    M block/qed.c
    M block/quorum.c
    M include/block/block.h
    M include/block/block_int.h
    M migration.c

  Log Message:
  -----------
  block: Add error handling to bdrv_invalidate_cache()

If it returns an error, the migrated VM will not be started, but qemu
exits with an error message.

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>


  Commit: 6e6507c06beb28e0551f68b13aa843ed1303f0f0
      
https://github.com/qemu/qemu/commit/6e6507c06beb28e0551f68b13aa843ed1303f0f0
  Author: Maria Kustova <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M qemu-io-cmds.c

  Log Message:
  -----------
  qemu-io-cmds: Fixed typo in example for writev.

Signed-off-by: Maria Kustova <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: d208cc353a2860dc9614ba651439713e4ecdf9d3
      
https://github.com/qemu/qemu/commit/d208cc353a2860dc9614ba651439713e4ecdf9d3
  Author: Maria Kustova <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M qemu-io.c

  Log Message:
  -----------
  qemu-io: Extended "--cmd" description in usage text

It's not clear from the usage description that "--cmd" option accepts
its argument as a string, so any special symbols have to be quoted from
the shell.

Updates in usage text:
 - Specified parameter format for "--cmd" option.
 - Added an instruction how to get help for "--cmd" option.

Signed-off-by: Maria Kustova <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 8a15b813e6034856d4177c6ab242791795434c15
      
https://github.com/qemu/qemu/commit/8a15b813e6034856d4177c6ab242791795434c15
  Author: Max Reitz <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Correct comment for realloc_refcount_block()

Contrary to the comment describing this function's behavior, it does not
return 0 on success, but rather the offset of the newly allocated
cluster. This patch adjusts the comment accordingly to reflect the
actual behavior.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a134d90f50806597c5da4fd191352fe62d40f71a
      
https://github.com/qemu/qemu/commit/a134d90f50806597c5da4fd191352fe62d40f71a
  Author: Max Reitz <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Fix fail path in realloc_refcount_block()

If qcow2_alloc_clusters() fails, new_offset and ret will both be
negative after the fail label, thus passing the first if condition and
subsequently resulting in a call of qcow2_free_clusters() with an
invalid (negative) offset parameter. Fix this by introducing a new label
"fail_free_cluster" which is only invoked if new_offset is indeed
pointing to a newly allocated cluster that should be cleaned up by
freeing it.

While we're at it, clean up the whole fail path. qcow2_cache_put()
should (and actually can) never fail, hence the return value can safely
be ignored (aside from asserting that it indeed did not fail).

Furthermore, there is no reason to give QCOW2_DISCARD_ALWAYS to
qcow2_free_clusters(), a mere QCOW2_DISCARD_OTHER will suffice.

Ultimately, rename the "fail" label to "done", as it is invoked both on
failure and success.

Suggested-by: Laszlo Ersek <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: b7d769c93214bd6e58d16009f47e61ccb541025c
      
https://github.com/qemu/qemu/commit/b7d769c93214bd6e58d16009f47e61ccb541025c
  Author: Peter Lieven <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M configure

  Log Message:
  -----------
  block/nfs: bump libnfs requirement to 1.9.3

libnfs prior to 1.9.3 contains a bug that will report
wrong transfer sizes if the file offset grows beyond 4GB
and RPC responses are received out of order. this
error is not detectable and fixable in qemu.

additionally 1.9.3 introduces support for handling short
read/writes in general and takes care of the necessary
retransmissions internally.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 20fccb187c54105177a7859360e3cb7166c8f22f
      
https://github.com/qemu/qemu/commit/20fccb187c54105177a7859360e3cb7166c8f22f
  Author: Peter Lieven <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  block/nfs: report errors from libnfs

if an NFS operation fails we should report what libnfs knows
about the failure. It is likely more than just an error code.

Signed-off-by: Peter Lieven <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 198fd05c357afff22f0b0e02639937519ed49b1f
      
https://github.com/qemu/qemu/commit/198fd05c357afff22f0b0e02639937519ed49b1f
  Author: Stefan Hajnoczi <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M hw/block/dataplane/virtio-blk.c

  Log Message:
  -----------
  dataplane: fix implicit IOThread refcount

When creating an IOThread implicitly (the user did not specify
x-iothread=<id>) remember that iothread_find() does not return the
object with an incremented refcount.

Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: c1b94a0ed2332b08ea7799c003c3ee9996782a3c
      
https://github.com/qemu/qemu/commit/c1b94a0ed2332b08ea7799c003c3ee9996782a3c
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-19 (Wed, 19 Mar 2014)

  Changed paths:
    M block.c
    M block/nfs.c
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/qed.c
    M block/quorum.c
    M configure
    M hw/block/dataplane/virtio-blk.c
    M include/block/block.h
    M include/block/block_int.h
    M migration.c
    M qemu-io-cmds.c
    M qemu-io.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block patches for 2.0.0-rc1

# gpg: Signature made Wed 19 Mar 2014 13:03:27 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream:
  dataplane: fix implicit IOThread refcount
  block/nfs: report errors from libnfs
  block/nfs: bump libnfs requirement to 1.9.3
  qcow2: Fix fail path in realloc_refcount_block()
  qcow2: Correct comment for realloc_refcount_block()
  qemu-io: Extended "--cmd" description in usage text
  qemu-io-cmds: Fixed typo in example for writev.
  block: Add error handling to bdrv_invalidate_cache()

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


Compare: https://github.com/qemu/qemu/compare/319c66d5abfb...c1b94a0ed233