ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Changlong Xie 2016-10-12 12:50:08 +08:00 committed by Max Reitz
parent 6d3f4049ba
commit f4f2539bcf
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block/replication.c
View File

@ -101,6 +101,11 @@ static int replication_open(BlockDriverState *bs, QDict *options,
if (!strcmp(mode, "primary")) { if (!strcmp(mode, "primary")) {
s->mode = REPLICATION_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")) { } else if (!strcmp(mode, "secondary")) {
s->mode = REPLICATION_MODE_SECONDARY; s->mode = REPLICATION_MODE_SECONDARY;
top_id = qemu_opt_get(opts, REPLICATION_TOP_ID); top_id = qemu_opt_get(opts, REPLICATION_TOP_ID);

3
qapi/block-core.json
View File

@ -2197,7 +2197,8 @@
# @mode: the replication mode # @mode: the replication mode
# #
# @top-id: #optional In secondary mode, node name or device ID of the root # @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 # Since: 2.8
## ##