Message ID | 20210429140424.2802929-1-armbru@redhat.com |
---|---|
State | New |
Headers | show |
Series | [v3] migration: Drop redundant query-migrate result @blocked | expand |
* Markus Armbruster (armbru@redhat.com) wrote: > Result @blocked is redundant. Unfortunately, we realized this too > close to the release to risk dropping it, so we deprecated it > instead, in commit e11ce6c06. > > Since it was deprecated from the start, we can delete it without > the customary grace period. Do so. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Queued > --- > v3: We picked the alternative "[PATCH] migration: Deprecate redundant > query-migrate result @blocked" for 6.0 (commit e11ce6c065). v3 is > v2 squashed into a clean revert that commit. I kept the R-bys for > v1 and v2. > > v2: Commit message improved. > > qapi/migration.json | 6 ------ > migration/migration.c | 29 +++++++++++++---------------- > monitor/hmp-cmds.c | 2 +- > 3 files changed, 14 insertions(+), 23 deletions(-) > > diff --git a/qapi/migration.json b/qapi/migration.json > index 0b17cce46b..7a5bdf9a0d 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -228,11 +228,6 @@ > # Present and non-empty when migration is blocked. > # (since 6.0) > # > -# @blocked: True if outgoing migration is blocked (since 6.0) > -# > -# Features: > -# @deprecated: Member @blocked is deprecated. Use @blocked-reasons instead. > -# > # Since: 0.14 > ## > { 'struct': 'MigrationInfo', > @@ -246,7 +241,6 @@ > '*setup-time': 'int', > '*cpu-throttle-percentage': 'int', > '*error-desc': 'str', > - 'blocked': { 'type': 'bool', 'features': [ 'deprecated' ] }, > '*blocked-reasons': ['str'], > '*postcopy-blocktime' : 'uint32', > '*postcopy-vcpu-blocktime': ['uint32'], > diff --git a/migration/migration.c b/migration/migration.c > index 8ca034136b..fdadee290e 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -1073,27 +1073,24 @@ static void populate_vfio_info(MigrationInfo *info) > static void fill_source_migration_info(MigrationInfo *info) > { > MigrationState *s = migrate_get_current(); > + GSList *cur_blocker = migration_blockers; > > - info->blocked = migration_is_blocked(NULL); > - info->has_blocked_reasons = info->blocked; > info->blocked_reasons = NULL; > - if (info->blocked) { > - GSList *cur_blocker = migration_blockers; > > - /* > - * There are two types of reasons a migration might be blocked; > - * a) devices marked in VMState as non-migratable, and > - * b) Explicit migration blockers > - * We need to add both of them here. > - */ > - qemu_savevm_non_migratable_list(&info->blocked_reasons); > + /* > + * There are two types of reasons a migration might be blocked; > + * a) devices marked in VMState as non-migratable, and > + * b) Explicit migration blockers > + * We need to add both of them here. > + */ > + qemu_savevm_non_migratable_list(&info->blocked_reasons); > > - while (cur_blocker) { > - QAPI_LIST_PREPEND(info->blocked_reasons, > - g_strdup(error_get_pretty(cur_blocker->data))); > - cur_blocker = g_slist_next(cur_blocker); > - } > + while (cur_blocker) { > + QAPI_LIST_PREPEND(info->blocked_reasons, > + g_strdup(error_get_pretty(cur_blocker->data))); > + cur_blocker = g_slist_next(cur_blocker); > } > + info->has_blocked_reasons = info->blocked_reasons != NULL; > > switch (s->state) { > case MIGRATION_STATUS_NONE: > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index 0ad5b77477..d9bef63373 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -224,7 +224,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) > > migration_global_dump(mon); > > - if (info->blocked) { > + if (info->blocked_reasons) { > strList *reasons = info->blocked_reasons; > monitor_printf(mon, "Outgoing migration blocked:\n"); > while (reasons) { > -- > 2.26.3 > >
diff --git a/qapi/migration.json b/qapi/migration.json index 0b17cce46b..7a5bdf9a0d 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -228,11 +228,6 @@ # Present and non-empty when migration is blocked. # (since 6.0) # -# @blocked: True if outgoing migration is blocked (since 6.0) -# -# Features: -# @deprecated: Member @blocked is deprecated. Use @blocked-reasons instead. -# # Since: 0.14 ## { 'struct': 'MigrationInfo', @@ -246,7 +241,6 @@ '*setup-time': 'int', '*cpu-throttle-percentage': 'int', '*error-desc': 'str', - 'blocked': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*blocked-reasons': ['str'], '*postcopy-blocktime' : 'uint32', '*postcopy-vcpu-blocktime': ['uint32'], diff --git a/migration/migration.c b/migration/migration.c index 8ca034136b..fdadee290e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1073,27 +1073,24 @@ static void populate_vfio_info(MigrationInfo *info) static void fill_source_migration_info(MigrationInfo *info) { MigrationState *s = migrate_get_current(); + GSList *cur_blocker = migration_blockers; - info->blocked = migration_is_blocked(NULL); - info->has_blocked_reasons = info->blocked; info->blocked_reasons = NULL; - if (info->blocked) { - GSList *cur_blocker = migration_blockers; - /* - * There are two types of reasons a migration might be blocked; - * a) devices marked in VMState as non-migratable, and - * b) Explicit migration blockers - * We need to add both of them here. - */ - qemu_savevm_non_migratable_list(&info->blocked_reasons); + /* + * There are two types of reasons a migration might be blocked; + * a) devices marked in VMState as non-migratable, and + * b) Explicit migration blockers + * We need to add both of them here. + */ + qemu_savevm_non_migratable_list(&info->blocked_reasons); - while (cur_blocker) { - QAPI_LIST_PREPEND(info->blocked_reasons, - g_strdup(error_get_pretty(cur_blocker->data))); - cur_blocker = g_slist_next(cur_blocker); - } + while (cur_blocker) { + QAPI_LIST_PREPEND(info->blocked_reasons, + g_strdup(error_get_pretty(cur_blocker->data))); + cur_blocker = g_slist_next(cur_blocker); } + info->has_blocked_reasons = info->blocked_reasons != NULL; switch (s->state) { case MIGRATION_STATUS_NONE: diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 0ad5b77477..d9bef63373 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -224,7 +224,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) migration_global_dump(mon); - if (info->blocked) { + if (info->blocked_reasons) { strList *reasons = info->blocked_reasons; monitor_printf(mon, "Outgoing migration blocked:\n"); while (reasons) {