| Message ID | 20170911110623.24981-39-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Hi, | expand |
Marc-André Lureau <marcandre.lureau@redhat.com> 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é Lureau <marcandre.lureau@redhat.com> > --- > 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' ] } > > ## > # @BlockdevOptionsFile: > @@ -2855,7 +2857,8 @@ > # > # Since: 2.9 > ## > -{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] } > +{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ], > + 'if': 'defined(CONFIG_REPLICATION)' } > > ## > # @BlockdevOptionsReplication: > @@ -2873,7 +2876,8 @@ > { 'struct': 'BlockdevOptionsReplication', > 'base': 'BlockdevOptionsGenericFormat', > 'data': { 'mode': 'ReplicationMode', > - '*top-id': 'str' } } > + '*top-id': 'str' }, > + 'if': 'defined(CONFIG_REPLICATION)' } > > ## > # @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)' } > > ## > # @ReplicationStatus: > @@ -1049,7 +1050,8 @@ > # Since: 2.9 > ## > { 'struct': 'ReplicationStatus', > - 'data': { 'error': 'bool', '*desc': 'str' } } > + 'data': { 'error': 'bool', '*desc': 'str' }, > + 'if': 'defined(CONFIG_REPLICATION)' } > > ## > # @query-xen-replication-status: > @@ -1066,7 +1068,8 @@ > # Since: 2.9 > ## > { 'command': 'query-xen-replication-status', > - 'returns': 'ReplicationStatus' } > + 'returns': 'ReplicationStatus', > + 'if': 'defined(CONFIG_REPLICATION)' } > > ## > # @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" > > static bool vmstate_loading; > @@ -147,11 +149,11 @@ void colo_do_failover(MigrationState *s) > } > } > > +#ifdef CONFIG_REPLICATION > void qmp_xen_set_replication(bool enable, bool primary, > bool has_failover, bool failover, > Error **errp) > { > -#ifdef CONFIG_REPLICATION > ReplicationMode mode = primary ? > REPLICATION_MODE_PRIMARY : > REPLICATION_MODE_SECONDARY; > @@ -170,14 +172,10 @@ void qmp_xen_set_replication(bool enable, bool primary, > } > replication_stop_all(failover, failover ? NULL : errp); > } > -#else > - abort(); > -#endif > } > > ReplicationStatus *qmp_query_xen_replication_status(Error **errp) > { > -#ifdef CONFIG_REPLICATION > Error *err = NULL; > ReplicationStatus *s = g_new0(ReplicationStatus, 1); > > @@ -192,19 +190,13 @@ ReplicationStatus *qmp_query_xen_replication_status(Error **errp) > > error_free(err); > return s; > -#else > - abort(); > -#endif > } > > void qmp_xen_colo_do_checkpoint(Error **errp) > { > -#ifdef CONFIG_REPLICATION > replication_do_checkpoint_all(errp); > -#else > - abort(); > -#endif > } > +#endif > > 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, QObject **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
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' ] } ## # @BlockdevOptionsFile: @@ -2855,7 +2857,8 @@ # # Since: 2.9 ## -{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] } +{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ], + 'if': 'defined(CONFIG_REPLICATION)' } ## # @BlockdevOptionsReplication: @@ -2873,7 +2876,8 @@ { 'struct': 'BlockdevOptionsReplication', 'base': 'BlockdevOptionsGenericFormat', 'data': { 'mode': 'ReplicationMode', - '*top-id': 'str' } } + '*top-id': 'str' }, + 'if': 'defined(CONFIG_REPLICATION)' } ## # @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)' } ## # @ReplicationStatus: @@ -1049,7 +1050,8 @@ # Since: 2.9 ## { 'struct': 'ReplicationStatus', - 'data': { 'error': 'bool', '*desc': 'str' } } + 'data': { 'error': 'bool', '*desc': 'str' }, + 'if': 'defined(CONFIG_REPLICATION)' } ## # @query-xen-replication-status: @@ -1066,7 +1068,8 @@ # Since: 2.9 ## { 'command': 'query-xen-replication-status', - 'returns': 'ReplicationStatus' } + 'returns': 'ReplicationStatus', + 'if': 'defined(CONFIG_REPLICATION)' } ## # @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" static bool vmstate_loading; @@ -147,11 +149,11 @@ void colo_do_failover(MigrationState *s) } } +#ifdef CONFIG_REPLICATION void qmp_xen_set_replication(bool enable, bool primary, bool has_failover, bool failover, Error **errp) { -#ifdef CONFIG_REPLICATION ReplicationMode mode = primary ? REPLICATION_MODE_PRIMARY : REPLICATION_MODE_SECONDARY; @@ -170,14 +172,10 @@ void qmp_xen_set_replication(bool enable, bool primary, } replication_stop_all(failover, failover ? NULL : errp); } -#else - abort(); -#endif } ReplicationStatus *qmp_query_xen_replication_status(Error **errp) { -#ifdef CONFIG_REPLICATION Error *err = NULL; ReplicationStatus *s = g_new0(ReplicationStatus, 1); @@ -192,19 +190,13 @@ ReplicationStatus *qmp_query_xen_replication_status(Error **errp) error_free(err); return s; -#else - abort(); -#endif } void qmp_xen_colo_do_checkpoint(Error **errp) { -#ifdef CONFIG_REPLICATION replication_do_checkpoint_all(errp); -#else - abort(); -#endif } +#endif 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, QObject **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
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(). * enum BlockdevDriver value "replication" in command blockdev-add As well as enum BlockdevDriver value @replication BlockdevOptions variant @replication, BlockdevOptionsReplication, BlockdevOptionsReplicationMode. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- qapi/block-core.json | 15 ++++++++++----- qapi/migration.json | 12 ++++++++---- migration/colo.c | 16 ++++------------ monitor.c | 5 ----- 4 files changed, 22 insertions(+), 26 deletions(-)