[Qemu-commits] [qemu/qemu] 7cf637: qemu-iotests: Handle cache mode option in 091

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7cf6376ae80e320fdaa6c9020f3e8ac1eecf1307
      
https://github.com/qemu/qemu/commit/7cf6376ae80e320fdaa6c9020f3e8ac1eecf1307
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M tests/qemu-iotests/091

  Log Message:
  -----------
  qemu-iotests: Handle cache mode option in 091

We should allow testing this on tmpfs. Any cache setting in iotests
should try to obey $CACHEMODE.

The cache mode is still "none" by default but overridable

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


  Commit: 4ba6fabfb447661ee44ee593b2c454c7ffd1183f
      
https://github.com/qemu/qemu/commit/4ba6fabfb447661ee44ee593b2c454c7ffd1183f
  Author: Leandro Dorileo <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M tests/Makefile
    A tests/test-qemu-opts.c

  Log Message:
  -----------
  QemuOpt: add unit tests

Cover basic aspects and API usage for QemuOpt. The current implementation
covers the API's planned to be changed by Chunyan Liu in his QEMUOptionParameter
replacement/cleanup job.

Other APIs should be covered in future improvements.

[Squashing in a small fix "QemuOpt: use qemu_find_opts_err() to avoid
output on stderr in tests".

qemu_find_opts() calls error_report() instead of propagating the Error
object.  It is undesirable to clutter test case output with error
messages from a passing test.

Use qemu_find_opts_err() to avoid the output on stderr.
--Stefan]

Signed-off-by: Leandro Dorileo <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: bd60436936ecebf2c683eef9ea561f2b949700f3
      
https://github.com/qemu/qemu/commit/bd60436936ecebf2c683eef9ea561f2b949700f3
  Author: Kevin Wolf <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/qcow2-cluster.c

  Log Message:
  -----------
  qcow2: Fix memory leak in COW error path

This triggers if bs->drv becomes NULL in a concurrent request. This is
currently only the case when corruption prevention kicks in (i.e. at
most once per image, and after that it produces I/O errors).

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


  Commit: 271c0f68b4eae72691721243a1c37f46a3232d61
      
https://github.com/qemu/qemu/commit/271c0f68b4eae72691721243a1c37f46a3232d61
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M tests/test-thread-pool.c
    M thread-pool.c

  Log Message:
  -----------
  aio: Fix use-after-free in cancellation path

The current flow of canceling a thread from THREAD_ACTIVE state is:

  1) Caller wants to cancel a request, so it calls thread_pool_cancel.

  2) thread_pool_cancel waits on the conditional variable
     elem->check_cancel.

  3) The worker thread changes state to THREAD_DONE once the task is
     done, and notifies elem->check_cancel to allow thread_pool_cancel
     to continue execution, and signals the notifier (pool->notifier) to
     allow callback function to be called later. But because of the
     global mutex, the notifier won't get processed until step 4) and 5)
     are done.

  4) thread_pool_cancel continues, leaving the notifier signaled, it
     just returns to caller.

  5) Caller thinks the request is already canceled successfully, so it
     releases any related data, such as freeing elem->common.opaque.

  6) In the next main loop iteration, the notifier handler,
     event_notifier_ready, is called. It finds the canceled thread in
     THREAD_DONE state, so calls elem->common.cb, with an (likely)
     dangling opaque pointer. This is a use-after-free.

Fix it by calling event_notifier_ready before leaving
thread_pool_cancel.

Test case update: This change will let cancel complete earlier than
test-thread-pool.c expects, so update the code to check this case: if
it's already done, done_cb sets .aiocb to NULL, skip calling
bdrv_aio_cancel on them.

Reported-by: Ulrich Obergfell <address@hidden>
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 0bf7488afbf42ccde75eb390afe5ea494c47f0c9
      
https://github.com/qemu/qemu/commit/0bf7488afbf42ccde75eb390afe5ea494c47f0c9
  Author: Max Reitz <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M tests/qemu-iotests/089
    M tests/qemu-iotests/089.out

  Log Message:
  -----------
  iotests: Use _img_info in test 089

Currently, test 089 uses $QEMU_IMG info manually in order to obtain the
according output. However, the iotests should generally use _img_info as
this filters out more irrelevant information such as the host image size
or format specific information. Therefore, test 089 should use _img_info
as well.

Signed-off-by: Max Reitz <address@hidden>
Reported-by: Kevin Wolf <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8574575f90e73ec93c2ef4bda4ae41c92fc8e644
      
https://github.com/qemu/qemu/commit/8574575f90e73ec93c2ef4bda4ae41c92fc8e644
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M include/block/block.h

  Log Message:
  -----------
  block: Add BlockOpType enum

This adds the enum of all the operations that can be taken on a block
device.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: fbe40ff780564526e6f639b3b78366727d34955c
      
https://github.com/qemu/qemu/commit/fbe40ff780564526e6f639b3b78366727d34955c
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block.c
    M include/block/block.h
    M include/block/block_int.h

  Log Message:
  -----------
  block: Introduce op_blockers to BlockDriverState

BlockDriverState.op_blockers is an array of lists with BLOCK_OP_TYPE_MAX
elements. Each list is a list of blockers of an operation type
(BlockOpType), that marks this BDS as currently blocked for a certain
type of operation with reason errors stored in the list. The rule of
usage is:

 * BDS user who wants to take an operation should check if there's any
   blocker of the type with bdrv_op_is_blocked().

 * BDS user who wants to block certain types of operation, should call
   bdrv_op_block (or bdrv_op_block_all to block all types of operations,
   which is similar to the existing bdrv_set_in_use()).

 * A blocker is only referenced by op_blockers, so the lifecycle is
   managed by caller, and shouldn't be lost until unblock, so typically
   a caller does these:

   - Allocate a blocker with error_setg or similar, call bdrv_op_block()
     to block some operations.
   - Hold the blocker, do his job.
   - Unblock operations that it blocked, with the same reason pointer
     passed to bdrv_op_unblock().
   - Release the blocker with error_free().

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 3718d8ab65f68de2acccbe6a315907805f54e3cc
      
https://github.com/qemu/qemu/commit/3718d8ab65f68de2acccbe6a315907805f54e3cc
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block-migration.c
    M block.c
    M blockdev.c
    M blockjob.c
    M hw/block/dataplane/virtio-blk.c
    M include/block/block.h
    M include/block/block_int.h
    M include/block/blockjob.h

  Log Message:
  -----------
  block: Replace in_use with operation blocker

This drops BlockDriverState.in_use with op_blockers:

  - Call bdrv_op_block_all in place of bdrv_set_in_use(bs, 1).

  - Call bdrv_op_unblock_all in place of bdrv_set_in_use(bs, 0).

  - Check bdrv_op_is_blocked() in place of bdrv_in_use(bs).

    The specific types are used, e.g. in place of starting block backup,
    bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKUP, ...).

    There is one exception in block_job_create, where
    bdrv_op_blocker_is_empty() is used, because we don't know the operation
    type here. This doesn't matter because in a few commits away we will drop
    the check and move it to callers that _do_ know the type.

  - Check bdrv_op_blocker_is_empty() in place of assert(!bs->in_use).

Note: there is only bdrv_op_block_all and bdrv_op_unblock_all callers at
this moment. So although the checks are specific to op types, this
changes can still be seen as identical logic with previously with
in_use. The difference is error message are improved because of blocker
error info.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 628ff683034c83ce54a1ae91d898d44e34f4851a
      
https://github.com/qemu/qemu/commit/628ff683034c83ce54a1ae91d898d44e34f4851a
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M blockdev.c
    M blockjob.c

  Log Message:
  -----------
  block: Move op_blocker check from block_job_create to its caller

It makes no sense to check for "any" blocker on bs, we are here only
because of the mechanical conversion from in_use to op_blockers. Remove
it now, and let the callers check specific operation types. Backup and
mirror already have it, add checker to stream and commit.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 8d24cce1e325c4bd47a8b1984d6db599f5a7a8e9
      
https://github.com/qemu/qemu/commit/8d24cce1e325c4bd47a8b1984d6db599f5a7a8e9
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block.c
    M include/block/block.h

  Log Message:
  -----------
  block: Add bdrv_set_backing_hd()

This is the common but non-trivial steps to assign or change the
backing_hd of BDS.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 920beae1037dc7d98cd876da8c83b402234c7dba
      
https://github.com/qemu/qemu/commit/920beae1037dc7d98cd876da8c83b402234c7dba
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block.c
    M block/stream.c
    M block/vvfat.c

  Log Message:
  -----------
  block: Use bdrv_set_backing_hd everywhere

We need to handle the coming backing_blocker properly, so don't open
code the assignment, instead, call bdrv_set_backing_hd to change
backing_hd.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 826b6ca0b0c00bf27562a85bc073f800dad1259b
      
https://github.com/qemu/qemu/commit/826b6ca0b0c00bf27562a85bc073f800dad1259b
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block.c
    M block/mirror.c
    M include/block/block_int.h

  Log Message:
  -----------
  block: Add backing_blocker in BlockDriverState

This makes use of op_blocker and blocks all the operations except for
commit target, on each BlockDriverState->backing_hd.

The asserts for op_blocker in bdrv_swap are removed because with this
change, the target of block commit has at least the backing blocker of
its child, so the assertion is not true. Callers should do their check.

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


  Commit: ce782938b86087bed21023ad6cfcd76a51d04f9e
      
https://github.com/qemu/qemu/commit/ce782938b86087bed21023ad6cfcd76a51d04f9e
  Author: Fam Zheng <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Drop redundant bdrv_refresh_limits

The above bdrv_set_backing_hd already does this.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 6815bce5421ddb4987cd98d0146baf65200eabcd
      
https://github.com/qemu/qemu/commit/6815bce5421ddb4987cd98d0146baf65200eabcd
  Author: Maria Kustova <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M docs/specs/qcow2.txt

  Log Message:
  -----------
  docs: Define refcount_bits value

The 'refcount_bits' term used in the description of refcount block entry is
not defined in the specification. The definition is added in the
'refcount_order' section where refcount_bits was used as 'width in bits'.

Signed-off-by: Maria Kustova <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e8817e7b0e0c355690d34bb499d50373137d240f
      
https://github.com/qemu/qemu/commit/e8817e7b0e0c355690d34bb499d50373137d240f
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  blockdev: Don't use qerror_report_err() in drive_init()

qerror_report_err() is a transitional interface to help with
converting existing HMP commands to QMP.  It should not be used
elsewhere.

drive_init() is not meant to be used by QMP commands.  It uses both
qerror_report_err() and error_report().  Convert the former to the
latter.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: b1422f20400e9dccd4388a4d107df5b67dba78d8
      
https://github.com/qemu/qemu/commit/b1422f20400e9dccd4388a4d107df5b67dba78d8
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  blockdev: Don't use qerror_report() in do_drive_del()

qerror_report() is a transitional interface to help with converting
existing HMP commands to QMP.  It should not be used elsewhere.

do_drive_del() is an HMP command that won't be converted to QMP (we'll
create a new QMP command instead).  It uses both qerror_report() and
error_report().  Convert the former to the latter.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 3775ec6f5a15da154bd8fbda284d34a3be580ee6
      
https://github.com/qemu/qemu/commit/3775ec6f5a15da154bd8fbda284d34a3be580ee6
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M qemu-nbd.c

  Log Message:
  -----------
  qemu-nbd: Don't use qerror_report()

qerror_report() is a transitional interface to help with converting
existing HMP commands to QMP.  It should not be used elsewhere.
Replace by error_report().

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d61563b2356eba9643ee711d900f0ad3c1f1f298
      
https://github.com/qemu/qemu/commit/d61563b2356eba9643ee711d900f0ad3c1f1f298
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/rbd.c

  Log Message:
  -----------
  block/rbd: Propagate errors to open and create methods

Completes the conversion to Error started in commit 015a103^..d5124c0.

Cc: Josh Durgin <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 04bc7c0e38fc77afc116031f1e25af80374b1971
      
https://github.com/qemu/qemu/commit/04bc7c0e38fc77afc116031f1e25af80374b1971
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  block/ssh: Drop superfluous libssh2_session_last_errno() calls

libssh2_session_last_error() already returns the error code.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 01c2b265fce921d6460e06f5af4dfb405119cbab
      
https://github.com/qemu/qemu/commit/01c2b265fce921d6460e06f5af4dfb405119cbab
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  block/ssh: Propagate errors through check_host_key()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 4618e658e6dadd1ba53585157984eac71cb706c6
      
https://github.com/qemu/qemu/commit/4618e658e6dadd1ba53585157984eac71cb706c6
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  block/ssh: Propagate errors through authenticate()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5f0c39e59822fdfd6a730824eded06209942e495
      
https://github.com/qemu/qemu/commit/5f0c39e59822fdfd6a730824eded06209942e495
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  block/ssh: Propagate errors through connect_to_ssh()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 5496fb1aebb624b379a503a8b2a156922a275fa1
      
https://github.com/qemu/qemu/commit/5496fb1aebb624b379a503a8b2a156922a275fa1
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  block/ssh: Propagate errors to open and create methods

Completes the conversion to Error started in commit 015a103^..d5124c0.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 68c70af16d75fc2f4d111536c7cf81cdd63851fa
      
https://github.com/qemu/qemu/commit/68c70af16d75fc2f4d111536c7cf81cdd63851fa
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/vvfat.c

  Log Message:
  -----------
  block/vvfat: Propagate errors through enable_write_target()

Continues the conversion of the open method to Error started in commit
015a103.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: d11c8917b2b286dbea93c7b05b2f368831e50724
      
https://github.com/qemu/qemu/commit/d11c8917b2b286dbea93c7b05b2f368831e50724
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/vvfat.c

  Log Message:
  -----------
  block/vvfat: Propagate errors through init_directories()

Completes the conversion of the open method to Error started in commit
015a103.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dfb12bf86eeb6cde388582ba5286b4fdcb0cfa4c
      
https://github.com/qemu/qemu/commit/dfb12bf86eeb6cde388582ba5286b4fdcb0cfa4c
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: Propagate errors through connect_to_sdog()

Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 356b4ca2bb8fe2e907a1dbdd7ed0a1a7f11c2645
      
https://github.com/qemu/qemu/commit/356b4ca2bb8fe2e907a1dbdd7ed0a1a7f11c2645
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: Propagate errors through get_sheep_fd()

Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 318df29e103ab8a3a5fe25106d0120e956db31aa
      
https://github.com/qemu/qemu/commit/318df29e103ab8a3a5fe25106d0120e956db31aa
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: Propagate errors through sd_prealloc()

Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 7d2d3e74e56b9a341e5206b8749b3d4e67c66959
      
https://github.com/qemu/qemu/commit/7d2d3e74e56b9a341e5206b8749b3d4e67c66959
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: Propagate errors through do_sd_create()

Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: dc83cd427b4709cec905f2657272d3e554e7abc2
      
https://github.com/qemu/qemu/commit/dc83cd427b4709cec905f2657272d3e554e7abc2
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: Propagate errors through find_vdi_name()

Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: e67c399363e39a4b78fa43f9cd0324ea1a7813bc
      
https://github.com/qemu/qemu/commit/e67c399363e39a4b78fa43f9cd0324ea1a7813bc
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: Propagate errors to open and create methods

Completes the conversion to Error started in commit 015a103^..d5124c0,
except for a few bugs fixed in the next commit.

Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: efde4b625216b7066b56707d70ae3212edad0eea
      
https://github.com/qemu/qemu/commit/efde4b625216b7066b56707d70ae3212edad0eea
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: Fix silent sd_open(), sd_create() failures

Open and create methods must set an error when they fail.

Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: fbab9ccbdbb4d8a18abf07b6dc05b3b4a2164cd0
      
https://github.com/qemu/qemu/commit/fbab9ccbdbb4d8a18abf07b6dc05b3b4a2164cd0
  Author: Markus Armbruster <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block/sheepdog.c

  Log Message:
  -----------
  block/sheepdog: Don't use qerror_report()

qerror_report() is a transitional interface to help with converting
existing HMP commands to QMP.  It should not be used elsewhere.
Replace by error_report().

Cc: MORITA Kazutaka <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>


  Commit: 3ee933c9d4869891a5614fba4815a3857dc3ef8f
      
https://github.com/qemu/qemu/commit/3ee933c9d4869891a5614fba4815a3857dc3ef8f
  Author: Peter Maydell <address@hidden>
  Date:   2014-05-28 (Wed, 28 May 2014)

  Changed paths:
    M block-migration.c
    M block.c
    M block/mirror.c
    M block/qcow2-cluster.c
    M block/rbd.c
    M block/sheepdog.c
    M block/ssh.c
    M block/stream.c
    M block/vvfat.c
    M blockdev.c
    M blockjob.c
    M docs/specs/qcow2.txt
    M hw/block/dataplane/virtio-blk.c
    M include/block/block.h
    M include/block/block_int.h
    M include/block/blockjob.h
    M qemu-nbd.c
    M tests/Makefile
    M tests/qemu-iotests/089
    M tests/qemu-iotests/089.out
    M tests/qemu-iotests/091
    A tests/test-qemu-opts.c
    M tests/test-thread-pool.c
    M thread-pool.c

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

Block pull request

# gpg: Signature made Wed 28 May 2014 13:31:15 BST using RSA key ID 81AB73C8
# gpg: Can't check signature: public key not found

* remotes/stefanha/tags/block-pull-request: (33 commits)
  block/sheepdog: Don't use qerror_report()
  block/sheepdog: Fix silent sd_open(), sd_create() failures
  block/sheepdog: Propagate errors to open and create methods
  block/sheepdog: Propagate errors through find_vdi_name()
  block/sheepdog: Propagate errors through do_sd_create()
  block/sheepdog: Propagate errors through sd_prealloc()
  block/sheepdog: Propagate errors through get_sheep_fd()
  block/sheepdog: Propagate errors through connect_to_sdog()
  block/vvfat: Propagate errors through init_directories()
  block/vvfat: Propagate errors through enable_write_target()
  block/ssh: Propagate errors to open and create methods
  block/ssh: Propagate errors through connect_to_ssh()
  block/ssh: Propagate errors through authenticate()
  block/ssh: Propagate errors through check_host_key()
  block/ssh: Drop superfluous libssh2_session_last_errno() calls
  block/rbd: Propagate errors to open and create methods
  qemu-nbd: Don't use qerror_report()
  blockdev: Don't use qerror_report() in do_drive_del()
  blockdev: Don't use qerror_report_err() in drive_init()
  docs: Define refcount_bits value
  ...

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


Compare: https://github.com/qemu/qemu/compare/052367ba8573...3ee933c9d486