[Qemu-commits] [qemu/qemu] 89dbe1: block/ssh: Add ssh_has_filename_options_conflict()

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 89dbe18089127cf90993359096b659ea6f819848
      
https://github.com/qemu/qemu/commit/89dbe18089127cf90993359096b659ea6f819848
  Author: Ashijeet Acharya <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  block/ssh: Add ssh_has_filename_options_conflict()

We have 5 options plus ("server") option which is added in the next
patch that conflict with specifying a SSH filename. We need to iterate
over all the options to check whether its key has an "server." prefix.

This iteration will help us adding the new option "server" easily.

Signed-off-by: Ashijeet Acharya <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 89cadc9dc0f7c6a48c243bf7d9ad983a9b667426
      
https://github.com/qemu/qemu/commit/89cadc9dc0f7c6a48c243bf7d9ad983a9b667426
  Author: Ashijeet Acharya <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M include/qemu/sockets.h
    M util/qemu-sockets.c

  Log Message:
  -----------
  util/qemu-sockets: Make inet_connect_saddr() public

Make inet_connect_saddr() in util/qemu-sockets.c public in order to be
able to use it with InetSocketAddress sockets outside of
util/qemu-sockets.c independently.

Signed-off-by: Ashijeet Acharya <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 0da5b8ef5d81c3fab0ba560c7c2140da27309023
      
https://github.com/qemu/qemu/commit/0da5b8ef5d81c3fab0ba560c7c2140da27309023
  Author: Ashijeet Acharya <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  block/ssh: Add InetSocketAddress and accept it

Add InetSocketAddress compatibility to SSH driver.

Add a new option "server" to the SSH block driver which then accepts
a InetSocketAddress.

"host" and "port" are supported as legacy options and are mapped to
their InetSocketAddress representation.

Signed-off-by: Ashijeet Acharya <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 1059f1bb42928e925f7dacb85da157a6e99c20ea
      
https://github.com/qemu/qemu/commit/1059f1bb42928e925f7dacb85da157a6e99c20ea
  Author: Ashijeet Acharya <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/ssh.c

  Log Message:
  -----------
  block/ssh: Use InetSocketAddress options

Drop the use of legacy options in favour of the InetSocketAddress
options.

Signed-off-by: Ashijeet Acharya <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: ad0e90a682280030af81ece502715f64232706db
      
https://github.com/qemu/qemu/commit/ad0e90a682280030af81ece502715f64232706db
  Author: Ashijeet Acharya <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  qapi: allow blockdev-add for ssh

Introduce new object 'BlockdevOptionsSsh' in qapi/block-core.json to
support blockdev-add for SSH network protocol driver. Use only 'struct
InetSocketAddress' since SSH only supports connection over TCP.

Signed-off-by: Ashijeet Acharya <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
[ kwolf: Removed host_key_check option, we want to expose this later in
  a structured way rather than as a string that must be parsed ]
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: c0778f6693213d0d6bfa7bee8045374a798db750
      
https://github.com/qemu/qemu/commit/c0778f6693213d0d6bfa7bee8045374a798db750
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

  Log Message:
  -----------
  block: Add bdrv_drain_all_{begin,end}()

bdrv_drain_all() doesn't allow the caller to do anything after all
pending requests have been completed but before block jobs are
resumed.

This patch splits bdrv_drain_all() into _begin() and _end() for that
purpose. It also adds aio_{disable,enable}_external() calls to disable
external clients in the meantime.

An important restriction of this split is that no new block jobs or
BlockDriverStates can be created between the bdrv_drain_all_begin()
and bdrv_drain_all_end() calls. This is not a concern now because
we'll only be using this in bdrv_reopen_multiple(), but it must be
dealt with if we ever have other uses cases in the future.

Signed-off-by: Alberto Garcia <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 40840e419be31e6a32e6ea24511c74b389d5e0e4
      
https://github.com/qemu/qemu/commit/40840e419be31e6a32e6ea24511c74b389d5e0e4
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Pause all jobs during bdrv_reopen_multiple()

When a BlockDriverState is about to be reopened it can trigger certain
operations that need to write to disk. During this process a different
block job can be woken up. If that block job completes and also needs
to call bdrv_reopen() it can happen that it needs to do it on the same
BlockDriverState that is still in the process of being reopened.

This can have fatal consequences, like in this example:

  1) Block job A starts and sleeps after a while.
  2) Block job B starts and tries to reopen node1 (a qcow2 file).
  3) Reopening node1 means flushing and replacing its qcow2 cache.
  4) While the qcow2 cache is being flushed, job A wakes up.
  5) Job A completes and reopens node1, replacing its cache.
  6) Job B resumes, but the cache that was being flushed no longer
     exists.

This patch splits the bdrv_drain_all() call to keep all block jobs
paused during bdrv_reopen_multiple(), so that step 4 can never happen
and the operation is safe.

Note that this scenario can only happen if both bdrv_reopen() calls
are made by block jobs on the same backing chain. Otherwise there's no
chance that the same BlockDriverState appears in both reopen queues.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 23d402d42beb975b97303beb3d9d4f60f4a1a883
      
https://github.com/qemu/qemu/commit/23d402d42beb975b97303beb3d9d4f60f4a1a883
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

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

When a block job is created on a certain BlockDriverState, operations
are blocked there while the job exists. However, some block jobs may
involve additional BDSs, which must be blocked separately when the job
is created and unblocked manually afterwards.

This patch adds block_job_add_bdrv(), that simplifies this process by
keeping a list of BDSs that are involved in the specified block job.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: cee3c6b5cab50a20cdb061ec107ec17bd2e54643
      
https://github.com/qemu/qemu/commit/cee3c6b5cab50a20cdb061ec107ec17bd2e54643
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/mirror.c

  Log Message:
  -----------
  block: Use block_job_add_bdrv() in mirror_start_job()

Use block_job_add_bdrv() instead of blocking all operations in
mirror_start_job() and unblocking them in mirror_exit().

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: b7340d002e1bcda6b7c07659a7e9d35842651476
      
https://github.com/qemu/qemu/commit/b7340d002e1bcda6b7c07659a7e9d35842651476
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/backup.c

  Log Message:
  -----------
  block: Use block_job_add_bdrv() in backup_start()

Use block_job_add_bdrv() instead of blocking all operations in
backup_start() and unblocking them in backup_run().

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 058223a6e3b73cdf7f56b8d0a55032f99c5f11ac
      
https://github.com/qemu/qemu/commit/058223a6e3b73cdf7f56b8d0a55032f99c5f11ac
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M blockdev.c

  Log Message:
  -----------
  block: Check blockers in all nodes involved in a block-commit job

qmp_block_commit() checks for op blockers in the active and
destination (base) images. However all nodes between top_bs and base
are also involved, and they are removed from the chain afterwards.

In addition to that, if top_bs is not the active layer then top_bs's
overlay also needs to be checked because it's involved in the job (its
backing image string needs to be updated to point to 'base').

This patch checks that none of those nodes are blocked.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 3e4c5122cbb881cd271314ef0782c4b6c57ab03d
      
https://github.com/qemu/qemu/commit/3e4c5122cbb881cd271314ef0782c4b6c57ab03d
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/commit.c

  Log Message:
  -----------
  block: Block all nodes involved in the block-commit operation

After a successful block-commit operation all nodes between top and
base are removed from the backing chain, and top's overlay needs to
be updated to point to base. Because of that we should prevent other
block jobs from messing with them.

This patch blocks all operations in these nodes in commit_start().

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: f3ede4b05d1407d48314f0edada5e402865e641e
      
https://github.com/qemu/qemu/commit/f3ede4b05d1407d48314f0edada5e402865e641e
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/mirror.c

  Log Message:
  -----------
  block: Block all intermediate nodes in commit_active_start()

When block-commit is launched without the top parameter, it uses
internally a mirror block job. In that case all intermediate nodes
between the active and base nodes must be blocked as well.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 61b49e48b379db45f0ea91c93a61c873695549a9
      
https://github.com/qemu/qemu/commit/61b49e48b379db45f0ea91c93a61c873695549a9
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

  Log Message:
  -----------
  block: Support streaming to an intermediate layer

This makes sure that the image we are streaming into is open in
read-write mode during the operation.

Operation blockers are also set in all intermediate nodes, since they
will be removed from the chain afterwards.

Finally, this also unblocks the stream operation in backing files.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 554b614765090f47d97a20ca6981e17e96515ec1
      
https://github.com/qemu/qemu/commit/554b614765090f47d97a20ca6981e17e96515ec1
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M blockdev.c
    M qapi/block-core.json

  Log Message:
  -----------
  block: Add QMP support for streaming to an intermediate layer

This patch makes the 'device' parameter of the 'block-stream' command
accept a node name that is not a root node. The presence of this
feature can't be directly tested with introspection; soon we'll
introduce a 'base-node' parameter whose presence can be checked for
this purpose.

In addition to that, operation blockers will be checked in all
intermediate nodes between the top and the base node.

Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 1029641bef0899ea95bbdf651c77e7856cdcbe37
      
https://github.com/qemu/qemu/commit/1029641bef0899ea95bbdf651c77e7856cdcbe37
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M docs/live-block-ops.txt

  Log Message:
  -----------
  docs: Document how to stream to an intermediate layer

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 7b8a9e5ab45a4532ce993f4273cfe0120abdea56
      
https://github.com/qemu/qemu/commit/7b8a9e5ab45a4532ce993f4273cfe0120abdea56
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

  Log Message:
  -----------
  qemu-iotests: Test streaming to an intermediate layer

This adds test_stream_intermediate(), similar to test_stream() but
streams to the intermediate image instead.

Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: c1a34322d86ccc16e09909bc2f96587e2c3ca82b
      
https://github.com/qemu/qemu/commit/c1a34322d86ccc16e09909bc2f96587e2c3ca82b
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

  Log Message:
  -----------
  qemu-iotests: Test block-stream operations in parallel

This test case checks that it's possible to launch several stream
operations in parallel in the same snapshot chain, each one involving
a different set of nodes.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: eb290b78ffec18975b7a31175de770e862749185
      
https://github.com/qemu/qemu/commit/eb290b78ffec18975b7a31175de770e862749185
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

  Log Message:
  -----------
  qemu-iotests: Test overlapping stream and commit operations

These test cases check that it's not possible to perform two
block-stream or block-commit operations if there are nodes involved in
both.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 704d59f13d5b0e02674f18fa32f8c44ca18abea3
      
https://github.com/qemu/qemu/commit/704d59f13d5b0e02674f18fa32f8c44ca18abea3
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

  Log Message:
  -----------
  qemu-iotests: Test block-stream and block-commit in parallel

As with test_stream_parallel(), we allow mixing block-stream and
block-commit operations in the same backing chain as long as there's
no overlap among the involved nodes.

Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: b0f904950c84c8de24ed0be75d5d48e2f7ff1e73
      
https://github.com/qemu/qemu/commit/b0f904950c84c8de24ed0be75d5d48e2f7ff1e73
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M tests/qemu-iotests/041
    M tests/qemu-iotests/139
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: Add iotests.supports_quorum()

There's many tests that need Quorum support in order to run. At the
moment each test implements its own check to see if Quorum is
enabled. This patch centralizes all those checks in a new function
called iotests.supports_quorum().

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 48361afba902ab90a9f667a94f863bafd1417d2e
      
https://github.com/qemu/qemu/commit/48361afba902ab90a9f667a94f863bafd1417d2e
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

  Log Message:
  -----------
  qemu-iotests: Test streaming to a Quorum child

Quorum children are special in the sense that they're not directly
attached to a block backend but they're not used as backing images
either. However the intermediate block streaming code supports
streaming to them. This is a test case for that scenario.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 312fe09cc8af86c25a0c17162539589121e7d9a9
      
https://github.com/qemu/qemu/commit/312fe09cc8af86c25a0c17162539589121e7d9a9
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M blockdev.c
    M docs/qmp-commands.txt
    M hmp.c
    M qapi/block-core.json

  Log Message:
  -----------
  block: Add 'base-node' parameter to the 'block-stream' command

The way to specify the node from which to copy data in the
block-stream operation is by using the 'base' parameter. This
parameter however takes a file name, not a node name.

Since we want to be able to perform this operation using only node
names, this patch adds a new 'base-node' parameter.

Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 7eb13c9daac7e02bcd4dc18ad4297a93ae34d235
      
https://github.com/qemu/qemu/commit/7eb13c9daac7e02bcd4dc18ad4297a93ae34d235
  Author: Alberto Garcia <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

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

  Log Message:
  -----------
  qemu-iotests: Test the 'base-node' parameter of 'block-stream'

The block-stream command has traditionally used the 'base' parameter
to indicate the image to copy the data from. This test checks that the
'base-node' parameter can also be used for the same purpose.

Signed-off-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 2fdc70452a59484c85359dc8d5a0650245288781
      
https://github.com/qemu/qemu/commit/2fdc70452a59484c85359dc8d5a0650245288781
  Author: Tomáš Golembiovský <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/raw_bsd.c
    M qapi/block-core.json

  Log Message:
  -----------
  raw_bsd: add offset and size options

Added two new options 'offset' and 'size'. This makes it possible to use
only part of the file as a device. This can be used e.g. to limit the
access only to single partition in a disk image or use a disk inside a
tar archive (like OVA).

When 'size' is specified we do our best to honour it.

Signed-off-by: Tomáš Golembiovský <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: ccc47808fd1cf3984860c60e81a8496f27dbb8a1
      
https://github.com/qemu/qemu/commit/ccc47808fd1cf3984860c60e81a8496f27dbb8a1
  Author: Tomáš Golembiovský <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    A tests/qemu-iotests/171
    A tests/qemu-iotests/171.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  qemu-iotests: test 'offset' and 'size' options in raw driver

Signed-off-by: Tomáš Golembiovský <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 68875e9fdae385f3be6c6f6eb1b62ae4065ea0be
      
https://github.com/qemu/qemu/commit/68875e9fdae385f3be6c6f6eb1b62ae4065ea0be
  Author: Eric Blake <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  block: Mention replication in BlockdevDriver enum docs

Missed in commit 82ac554.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 94d6a7a76e9df9919629428f6c598e2b97d9426c
      
https://github.com/qemu/qemu/commit/94d6a7a76e9df9919629428f6c598e2b97d9426c
  Author: Ashijeet Acharya <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  block/nfs: Introduce runtime_opts in NFS

Make NFS block driver use various fine grained runtime_opts.
Set .bdrv_parse_filename() to nfs_parse_filename() and introduce two
new functions nfs_parse_filename() and nfs_parse_uri() to help parsing
the URI.
Add a new option "server" which then accepts a new struct NFSServer.

Signed-off-by: Ashijeet Acharya <address@hidden>
[ kwolf: Fixed client->path ]
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: aa2623d817e7ecb62fd917e475ccc0d42dd1a413
      
https://github.com/qemu/qemu/commit/aa2623d817e7ecb62fd917e475ccc0d42dd1a413
  Author: Ashijeet Acharya <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  qapi: allow blockdev-add for NFS

Introduce new object 'BlockdevOptionsNFS' in qapi/block-core.json to
support blockdev-add for NFS network protocol driver. Also make a new
struct NFSServer to support tcp connection.

Signed-off-by: Ashijeet Acharya <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 8ff7fd8a29e62e685b3977f6db2c2f3661e96da9
      
https://github.com/qemu/qemu/commit/8ff7fd8a29e62e685b3977f6db2c2f3661e96da9
  Author: Peter Maydell <address@hidden>
  Date:   2016-10-31 (Mon, 31 Oct 2016)

  Changed paths:
    M block.c
    M block/backup.c
    M block/commit.c
    M block/io.c
    M block/mirror.c
    M block/nfs.c
    M block/raw_bsd.c
    M block/ssh.c
    M block/stream.c
    M blockdev.c
    M blockjob.c
    M docs/live-block-ops.txt
    M docs/qmp-commands.txt
    M hmp.c
    M include/block/block.h
    M include/block/blockjob.h
    M include/qemu/sockets.h
    M qapi/block-core.json
    M tests/qemu-iotests/030
    M tests/qemu-iotests/030.out
    M tests/qemu-iotests/041
    M tests/qemu-iotests/139
    A tests/qemu-iotests/171
    A tests/qemu-iotests/171.out
    M tests/qemu-iotests/group
    M tests/qemu-iotests/iotests.py
    M util/qemu-sockets.c

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

Block layer patches

# gpg: Signature made Mon 31 Oct 2016 16:10:07 GMT
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream: (29 commits)
  qapi: allow blockdev-add for NFS
  block/nfs: Introduce runtime_opts in NFS
  block: Mention replication in BlockdevDriver enum docs
  qemu-iotests: test 'offset' and 'size' options in raw driver
  raw_bsd: add offset and size options
  qemu-iotests: Test the 'base-node' parameter of 'block-stream'
  block: Add 'base-node' parameter to the 'block-stream' command
  qemu-iotests: Test streaming to a Quorum child
  qemu-iotests: Add iotests.supports_quorum()
  qemu-iotests: Test block-stream and block-commit in parallel
  qemu-iotests: Test overlapping stream and commit operations
  qemu-iotests: Test block-stream operations in parallel
  qemu-iotests: Test streaming to an intermediate layer
  docs: Document how to stream to an intermediate layer
  block: Add QMP support for streaming to an intermediate layer
  block: Support streaming to an intermediate layer
  block: Block all intermediate nodes in commit_active_start()
  block: Block all nodes involved in the block-commit operation
  block: Check blockers in all nodes involved in a block-commit job
  block: Use block_job_add_bdrv() in backup_start()
  ...

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


Compare: https://github.com/qemu/qemu/compare/6bc56d317f7b...8ff7fd8a29e6