From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eP7sf-0002gR-NY for qemu-devel@nongnu.org; Wed, 13 Dec 2017 09:19:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eP7sc-00051U-EK for qemu-devel@nongnu.org; Wed, 13 Dec 2017 09:19:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46896) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eP7sc-0004zn-5X for qemu-devel@nongnu.org; Wed, 13 Dec 2017 09:19:26 -0500 From: Markus Armbruster References: <20170911110623.24981-1-marcandre.lureau@redhat.com> <20170911110623.24981-39-marcandre.lureau@redhat.com> Date: Wed, 13 Dec 2017 15:19:20 +0100 In-Reply-To: <20170911110623.24981-39-marcandre.lureau@redhat.com> (=?utf-8?Q?=22Marc-Andr=C3=A9?= Lureau"'s message of "Mon, 11 Sep 2017 13:06:11 +0200") Message-ID: <87a7ymaexj.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 38/50] qapi: add conditions to REPLICATION type/commands on the schema List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: qemu-devel@nongnu.org, zhanghailiang , Juan Quintela , "Dr. David Alan Gilbert" Marc-Andr=C3=A9 Lureau writes: > Add #if defined(CONFIG_REPLICATION) in generated code, and adjust the > code accordingly. > > Made conditional: > > * xen-set-replication, query-xen-replication-status, > xen-colo-do-checkpoint > > Before the patch, we first register the commands unconditionally in > generated code (requires a stub), then conditionally unregister in > qmp_unregister_commands_hack(). > > Afterwards, we register only when CONFIG_REPLICATION. The command > fails exactly the same, with CommandNotFound. > > Improvement, because now query-qmp-schema is accurate, and we're one > step close to killing qmp_unregister_commands_hack(). s/close/closer/ > > * enum BlockdevDriver value "replication" in command blockdev-add > > As well as enum BlockdevDriver value @replication BlockdevOptions Missing a comma after @replication? > variant @replication, BlockdevOptionsReplication, > BlockdevOptionsReplicationMode. > > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > qapi/block-core.json | 15 ++++++++++----- > qapi/migration.json | 12 ++++++++---- > migration/colo.c | 16 ++++------------ > monitor.c | 5 ----- > 4 files changed, 22 insertions(+), 26 deletions(-) > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index bb11815608..6f897cf157 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -2232,8 +2232,10 @@ > 'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom', > 'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs= ', > 'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', > - 'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh', > - 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] } > + 'quorum', 'raw', 'rbd', > + { 'name': 'replication', 'if': 'defined(CONFIG_REPLICATION)'= }, > + 'sheepdog', 'ssh', 'throttle', > + 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] } >=20=20 > ## > # @BlockdevOptionsFile: > @@ -2855,7 +2857,8 @@ > # > # Since: 2.9 > ## > -{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] } > +{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ], > + 'if': 'defined(CONFIG_REPLICATION)' } >=20=20 > ## > # @BlockdevOptionsReplication: > @@ -2873,7 +2876,8 @@ > { 'struct': 'BlockdevOptionsReplication', > 'base': 'BlockdevOptionsGenericFormat', > 'data': { 'mode': 'ReplicationMode', > - '*top-id': 'str' } } > + '*top-id': 'str' }, > + 'if': 'defined(CONFIG_REPLICATION)' } >=20=20 > ## > # @NFSTransport: > @@ -3168,7 +3172,8 @@ > 'quorum': 'BlockdevOptionsQuorum', > 'raw': 'BlockdevOptionsRaw', > 'rbd': 'BlockdevOptionsRbd', > - 'replication':'BlockdevOptionsReplication', > + 'replication': { 'type': 'BlockdevOptionsReplication', > + 'if': 'defined(CONFIG_REPLICATION)' }, > 'sheepdog': 'BlockdevOptionsSheepdog', > 'ssh': 'BlockdevOptionsSsh', > 'throttle': 'BlockdevOptionsThrottle', > diff --git a/qapi/migration.json b/qapi/migration.json > index ee2b3b8733..44d2ef9c94 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -1034,7 +1034,8 @@ > # Since: 2.9 > ## > { 'command': 'xen-set-replication', > - 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' } } > + 'data': { 'enable': 'bool', 'primary': 'bool', '*failover' : 'bool' }, > + 'if': 'defined(CONFIG_REPLICATION)' } >=20=20 > ## > # @ReplicationStatus: > @@ -1049,7 +1050,8 @@ > # Since: 2.9 > ## > { 'struct': 'ReplicationStatus', > - 'data': { 'error': 'bool', '*desc': 'str' } } > + 'data': { 'error': 'bool', '*desc': 'str' }, > + 'if': 'defined(CONFIG_REPLICATION)' } >=20=20 > ## > # @query-xen-replication-status: > @@ -1066,7 +1068,8 @@ > # Since: 2.9 > ## > { 'command': 'query-xen-replication-status', > - 'returns': 'ReplicationStatus' } > + 'returns': 'ReplicationStatus', > + 'if': 'defined(CONFIG_REPLICATION)' } >=20=20 > ## > # @xen-colo-do-checkpoint: > @@ -1082,4 +1085,5 @@ > # > # Since: 2.9 > ## > -{ 'command': 'xen-colo-do-checkpoint' } > +{ 'command': 'xen-colo-do-checkpoint', > + 'if': 'defined(CONFIG_REPLICATION)' } > diff --git a/migration/colo.c b/migration/colo.c > index dee3aa8bf7..010c9e02e8 100644 > --- a/migration/colo.c > +++ b/migration/colo.c > @@ -22,7 +22,9 @@ > #include "trace.h" > #include "qemu/error-report.h" > #include "migration/failover.h" > +#ifdef CONFIG_REPLICATION > #include "replication.h" > +#endif > #include "qmp-commands.h" >=20=20 > static bool vmstate_loading; > @@ -147,11 +149,11 @@ void colo_do_failover(MigrationState *s) > } > } >=20=20 > +#ifdef CONFIG_REPLICATION > void qmp_xen_set_replication(bool enable, bool primary, > bool has_failover, bool failover, > Error **errp) > { > -#ifdef CONFIG_REPLICATION > ReplicationMode mode =3D primary ? > REPLICATION_MODE_PRIMARY : > REPLICATION_MODE_SECONDARY; > @@ -170,14 +172,10 @@ void qmp_xen_set_replication(bool enable, bool prim= ary, > } > replication_stop_all(failover, failover ? NULL : errp); > } > -#else > - abort(); > -#endif > } >=20=20 > ReplicationStatus *qmp_query_xen_replication_status(Error **errp) > { > -#ifdef CONFIG_REPLICATION > Error *err =3D NULL; > ReplicationStatus *s =3D g_new0(ReplicationStatus, 1); >=20=20 > @@ -192,19 +190,13 @@ ReplicationStatus *qmp_query_xen_replication_status= (Error **errp) >=20=20 > error_free(err); > return s; > -#else > - abort(); > -#endif > } >=20=20 > void qmp_xen_colo_do_checkpoint(Error **errp) > { > -#ifdef CONFIG_REPLICATION > replication_do_checkpoint_all(errp); > -#else > - abort(); > -#endif > } > +#endif >=20=20 > static void colo_send_message(QEMUFile *f, COLOMessage msg, > Error **errp) > diff --git a/monitor.c b/monitor.c > index 135a1e0821..b5ddcf8c67 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -970,11 +970,6 @@ static void qmp_query_qmp_schema(QDict *qdict, QObje= ct **ret_data, > */ > static void qmp_unregister_commands_hack(void) > { > -#ifndef CONFIG_REPLICATION > - qmp_unregister_command(&qmp_commands, "xen-set-replication"); > - qmp_unregister_command(&qmp_commands, "query-xen-replication-status"= ); > - qmp_unregister_command(&qmp_commands, "xen-colo-do-checkpoint"); > -#endif > #ifndef TARGET_I386 > qmp_unregister_command(&qmp_commands, "rtc-reset-reinjection"); > #endif