From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 13 Sep 2016 13:31:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4dfbe3767af503a4cd137b15c8a9d8f30b20a6e9;p=qemu.git

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

Pull request

v2:
 * Fixed qcow2 sanitizer warnings [Peter]
 * Renamed get_error test cases to get_error_all to avoid tripping "error:"
   grep scripts [Peter]
 * Added Fam's iothread stop patch

# gpg: Signature made Tue 13 Sep 2016 11:02:30 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  iothread: Stop threads before main() quits
  tests: fix qvirtqueue_kick
  MAINTAINERS: add maintainer for replication
  support replication driver in blockdev-add
  tests: add unit test case for replication
  replication: Implement new driver for block replication
  replication: Introduce new APIs to do replication operation
  configure: support replication
  mirror: auto complete active commit
  docs: block replication's description
  block: Link backup into block core
  Backup: export interfaces for extra serialization
  Backup: clear all bitmap when doing block checkpoint
  block: unblock backup operations in backing file
  virtio-blk: rename virtio_device_info to virtio_blk_info
  linux-aio: process completions from ioq_submit()
  linux-aio: split processing events function
  linux-aio: consume events in userspace instead of calling io_getevents
  qcow2: avoid memcpy(dst, NULL, len)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

4dfbe3767af503a4cd137b15c8a9d8f30b20a6e9
diff --cc qapi/block-core.json
index 173fb08ea3,ada3202ff5..24223fd08a
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@@ -2174,9 -2161,38 +2175,39 @@@
    'data': { 'volume': 'str',
              'path': 'str',
              'server': ['GlusterServer'],
 -            '*debug-level': 'int' } }
 +            '*debug-level': 'int',
 +            '*logfile': 'str' } }
  
+ ##
+ # @ReplicationMode
+ #
+ # An enumeration of replication modes.
+ #
+ # @primary: Primary mode, the vm's state will be sent to secondary QEMU.
+ #
+ # @secondary: Secondary mode, receive the vm's state from primary QEMU.
+ #
+ # Since: 2.8
+ ##
+ { 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] }
+ 
+ ##
+ # @BlockdevOptionsReplication
+ #
+ # Driver specific block device options for replication
+ #
+ # @mode: the replication mode
+ #
+ # @top-id: #optional In secondary mode, node name or device ID of the root
+ #          node who owns the replication node chain. Ignored in primary mode.
+ #
+ # Since: 2.8
+ ##
+ { 'struct': 'BlockdevOptionsReplication',
+   'base': 'BlockdevOptionsGenericFormat',
+   'data': { 'mode': 'ReplicationMode',
+             '*top-id': 'str' } }
+ 
  ##
  # @BlockdevOptions
  #