[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2 01/13] migration: assert colo instead of chec
From: |
Juan Quintela |
Subject: |
Re: [Qemu-devel] [PATCH v2 01/13] migration: assert colo instead of check |
Date: |
Wed, 03 Jan 2018 13:23:58 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Peter Xu <address@hidden> wrote:
> When reaching here if we are still "active" it means we must be in colo
> state. After a quick discussion offlist, we decided to use the safer
> error_report().
>
> Finally I want to use "switch" here rather than lots of complicated if
> clauses.
>
> Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
> ---
> migration/migration.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/migration/migration.c b/migration/migration.c
> index 4de3b551fe..5a12738447 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -2309,7 +2309,15 @@ static void *migration_thread(void *opaque)
> }
> runstate_set(RUN_STATE_POSTMIGRATE);
> } else {
> - if (s->state == MIGRATION_STATUS_ACTIVE && enable_colo) {
> + if (s->state == MIGRATION_STATUS_ACTIVE) {
> + /*
> + * We should really assert here, but since it's during
> + * migration, let's try to reduce the usage of assertions.
> + */
> + if (!enable_colo) {
> + error_report("%s: critical error: calling COLO code without "
> + "COLO enabled", __func__);
I will put on the error message something like:
"%s: critical error: State ACTIVE without COLO being enable. That is
forbidden/imposible".
And then you don't need the previous comment?
Later, Juan.
> + }
> migrate_start_colo_process(s);
> qemu_savevm_state_cleanup();
> /*
- [Qemu-devel] [PATCH v2 00/13] migration: cleanup migration_thread(), Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 01/13] migration: assert colo instead of check, Peter Xu, 2018/01/03
- Re: [Qemu-devel] [PATCH v2 01/13] migration: assert colo instead of check,
Juan Quintela <=
- [Qemu-devel] [PATCH v2 02/13] migration: qemu_savevm_state_cleanup() in cleanup, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 03/13] migration: remove "enable_colo" var, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 04/13] migration: split use of MigrationState.total_time, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 05/13] migration: move vm_old_running into global state, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 06/13] migration: introduce downtime_start, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 07/13] migration: introduce migrate_calculate_complete, Peter Xu, 2018/01/03
- [Qemu-devel] [PATCH v2 08/13] migration: use switch at the end of migration, Peter Xu, 2018/01/03