diff options
| author | Changlong Xie <xiecl.fnst@cn.fujitsu.com> | 2016-10-12 12:50:08 +0800 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2016-10-24 17:56:07 +0200 |
| commit | f4f2539bcf2d41f96d7e60c4c7e81ecdf5d81c63 (patch) | |
| tree | ae90b95ea95890d41acd9b60518fc37471880dec | |
| parent | 6d3f4049ba532b01ff738f9e5a66df1477c5ffdd (diff) | |
| download | qemu-f4f2539bcf2d41f96d7e60c4c7e81ecdf5d81c63.zip | |
block/replication: Clarify 'top-id' parameter usage
The replication driver only supports the 'top-id' parameter for the
secondary side; it must not be supplied for the primary side.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com>
Message-id: 1476247808-15646-1-git-send-email-xiecl.fnst@cn.fujitsu.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | block/replication.c | 5 | ||||
| -rw-r--r-- | qapi/block-core.json | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/block/replication.c b/block/replication.c index 3bd1cf1809..8bbfc8f870 100644 --- a/block/replication.c +++ b/block/replication.c @@ -101,6 +101,11 @@ static int replication_open(BlockDriverState *bs, QDict *options, if (!strcmp(mode, "primary")) { s->mode = REPLICATION_MODE_PRIMARY; + top_id = qemu_opt_get(opts, REPLICATION_TOP_ID); + if (top_id) { + error_setg(&local_err, "The primary side does not support option top-id"); + goto fail; + } } else if (!strcmp(mode, "secondary")) { s->mode = REPLICATION_MODE_SECONDARY; top_id = qemu_opt_get(opts, REPLICATION_TOP_ID); diff --git a/qapi/block-core.json b/qapi/block-core.json index c59047bc94..97b120532a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2197,7 +2197,8 @@ # @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. +# node who owns the replication node chain. Must not be given in +# primary mode. # # Since: 2.8 ## |