| Message ID | 1476182772-11693-3-git-send-email-xiecl.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/11/2016 05:46 AM, Changlong Xie wrote: > Replication driver only support 'top-id' parameter in secondary side, > and it must not be supplied in primary side Grammar suggestion: The replication driver only supports the 'top-id' parameter for the secondary side; it must not be supplied for the primary side. > > Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com> > --- > block/replication.c | 5 +++++ > qapi/block-core.json | 3 ++- > 2 files changed, 7 insertions(+), 1 deletion(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On 10/11/2016 10:54 PM, Eric Blake wrote: > The replication driver only supports the 'top-id' parameter for the > secondary side; it must not be supplied for the primary side. Will apply in next version. Thanks -Xie
diff --git a/block/replication.c b/block/replication.c index 5b432d9..1d0f115 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 4badb97..ec92df4 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 ##
Replication driver only support 'top-id' parameter in secondary side, and it must not be supplied in primary side Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com> --- block/replication.c | 5 +++++ qapi/block-core.json | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)