OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Migration/colo.c: Fix COLO failover status error

Browse Source 
When finished COLO failover, the status is FAILOVER_STATUS_COMPLETED.
The origin codes misunderstand the FAILOVER_STATUS_REQUIRE.

Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Zhang Chen 2019-03-22 18:13:30 +08:00 committed by Juan Quintela
parent 281496bb8a
commit 1fe6ab267f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migration/colo.c
View File

@ -121,6 +121,7 @@ static void secondary_vm_do_failover(void)
} }
/* Notify COLO incoming thread that failover work is finished */ /* Notify COLO incoming thread that failover work is finished */
qemu_sem_post(&mis->colo_incoming_sem); qemu_sem_post(&mis->colo_incoming_sem);
/* For Secondary VM, jump to incoming co */ /* For Secondary VM, jump to incoming co */
if (mis->migration_incoming_co) { if (mis->migration_incoming_co) {
qemu_coroutine_enter(mis->migration_incoming_co); qemu_coroutine_enter(mis->migration_incoming_co);
@ -262,7 +263,7 @@ COLOStatus *qmp_query_colo_status(Error **errp)
case FAILOVER_STATUS_NONE: case FAILOVER_STATUS_NONE:
s->reason = COLO_EXIT_REASON_NONE; s->reason = COLO_EXIT_REASON_NONE;
break; break;
case FAILOVER_STATUS_REQUIRE: case FAILOVER_STATUS_COMPLETED:
s->reason = COLO_EXIT_REASON_REQUEST; s->reason = COLO_EXIT_REASON_REQUEST;
break; break;
default: default:
@ -582,7 +583,7 @@ out:
qapi_event_send_colo_exit(COLO_MODE_PRIMARY, qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_ERROR); COLO_EXIT_REASON_ERROR);
break; break;
case FAILOVER_STATUS_REQUIRE: case FAILOVER_STATUS_COMPLETED:
qapi_event_send_colo_exit(COLO_MODE_PRIMARY, qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_REQUEST); COLO_EXIT_REASON_REQUEST);
break; break;
@ -854,7 +855,7 @@ out:
qapi_event_send_colo_exit(COLO_MODE_SECONDARY, qapi_event_send_colo_exit(COLO_MODE_SECONDARY,
COLO_EXIT_REASON_ERROR); COLO_EXIT_REASON_ERROR);
break; break;
case FAILOVER_STATUS_REQUIRE: case FAILOVER_STATUS_COMPLETED:
qapi_event_send_colo_exit(COLO_MODE_SECONDARY, qapi_event_send_colo_exit(COLO_MODE_SECONDARY,
COLO_EXIT_REASON_REQUEST); COLO_EXIT_REASON_REQUEST);
break; break;