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

migration: Drop redundant query-migrate result @blocked 

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>
Message-Id: <20210429140424.2802929-1-armbru@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Markus Armbruster 2021-04-29 16:04:24 +02:00 committed by Dr. David Alan Gilbert
parent ba1b7c812c
commit 372043f389
3 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
migration/migration.c
View File

@ -1073,27 +1073,24 @@ static void populate_vfio_info(MigrationInfo *info)
static void fill_source_migration_info(MigrationInfo *info) static void fill_source_migration_info(MigrationInfo *info)
{ {
MigrationState *s = migrate_get_current(); 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; info->blocked_reasons = NULL;
if (info->blocked) {
GSList *cur_blocker = migration_blockers;
/* /*
* There are two types of reasons a migration might be blocked; * There are two types of reasons a migration might be blocked;
* a) devices marked in VMState as non-migratable, and * a) devices marked in VMState as non-migratable, and
* b) Explicit migration blockers * b) Explicit migration blockers
* We need to add both of them here. * We need to add both of them here.
*/ */
qemu_savevm_non_migratable_list(&info->blocked_reasons); qemu_savevm_non_migratable_list(&info->blocked_reasons);
while (cur_blocker) { while (cur_blocker) {
QAPI_LIST_PREPEND(info->blocked_reasons, QAPI_LIST_PREPEND(info->blocked_reasons,
g_strdup(error_get_pretty(cur_blocker->data))); g_strdup(error_get_pretty(cur_blocker->data)));
cur_blocker = g_slist_next(cur_blocker); cur_blocker = g_slist_next(cur_blocker);
}
} }
info->has_blocked_reasons = info->blocked_reasons != NULL;
switch (s->state) { switch (s->state) {
case MIGRATION_STATUS_NONE: case MIGRATION_STATUS_NONE:

2
monitor/hmp-cmds.c
View File

@ -224,7 +224,7 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
migration_global_dump(mon); migration_global_dump(mon);
if (info->blocked) { if (info->blocked_reasons) {
strList *reasons = info->blocked_reasons; strList *reasons = info->blocked_reasons;
monitor_printf(mon, "Outgoing migration blocked:\n"); monitor_printf(mon, "Outgoing migration blocked:\n");
while (reasons) { while (reasons) {

6
qapi/migration.json
View File

@ -228,11 +228,6 @@
# Present and non-empty when migration is blocked. # Present and non-empty when migration is blocked.
# (since 6.0) # (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 # Since: 0.14
## ##
{ 'struct': 'MigrationInfo', { 'struct': 'MigrationInfo',
@ -246,7 +241,6 @@
'*setup-time': 'int', '*setup-time': 'int',
'*cpu-throttle-percentage': 'int', '*cpu-throttle-percentage': 'int',
'*error-desc': 'str', '*error-desc': 'str',
'blocked': { 'type': 'bool', 'features': [ 'deprecated' ] },
'*blocked-reasons': ['str'], '*blocked-reasons': ['str'],
'*postcopy-blocktime' : 'uint32', '*postcopy-blocktime' : 'uint32',
'*postcopy-vcpu-blocktime': ['uint32'], '*postcopy-vcpu-blocktime': ['uint32'],