[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/27] migration: Use always helper to set state
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 21/27] migration: Use always helper to set state |
Date: |
Thu, 2 Jul 2015 18:10:09 +0200 |
There were three places that were not using the migrate_set_state()
helper, just fix that.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 5c1233f..78eb715 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -549,7 +549,7 @@ void migrate_fd_error(MigrationState *s)
{
trace_migrate_fd_error();
assert(s->file == NULL);
- s->state = MIGRATION_STATUS_FAILED;
+ migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
trace_migrate_set_state(MIGRATION_STATUS_FAILED);
notifier_list_notify(&migration_state_notifiers, s);
}
@@ -634,7 +634,7 @@ static MigrationState *migrate_init(const MigrationParams
*params)
s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
decompress_thread_count;
s->bandwidth_limit = bandwidth_limit;
- s->state = MIGRATION_STATUS_SETUP;
+ migrate_set_state(s, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP);
trace_migrate_set_state(MIGRATION_STATUS_SETUP);
s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
@@ -733,7 +733,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
} else {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "uri",
"a valid migration protocol");
- s->state = MIGRATION_STATUS_FAILED;
+ migrate_set_state(s, MIGRATION_STATUS_SETUP, MIGRATION_STATUS_FAILED);
return;
}
--
2.4.3
- [Qemu-devel] [PULL 10/27] Sanity check RDMA remote data, (continued)
- [Qemu-devel] [PULL 10/27] Sanity check RDMA remote data, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 09/27] Sort destination RAMBlocks to be the same as the source, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 11/27] Fail more cleanly in mismatched RAM cases, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 12/27] Fix older machine type compatibility on power with section footers, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 13/27] runstate: Add runstate store, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 14/27] runstate: migration allows more transitions now, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 15/27] migration: create new section to store global state, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 16/27] global_state: Make section optional, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 17/27] vmstate: Create optional sections, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 20/27] migration: ensure we start in NONE state, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 21/27] migration: Use always helper to set state,
Juan Quintela <=
- [Qemu-devel] [PULL 19/27] migration: Use cmpxchg correctly, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 18/27] migration: Add configuration section, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 24/27] migration: Add migration events on target side, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 22/27] migration: No need to call trace_migrate_set_state(), Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 23/27] migration: create migration event, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 25/27] check_section_footers: Check the correct section_id, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 26/27] migration: protect migration_bitmap, Juan Quintela, 2015/07/02
- [Qemu-devel] [PULL 27/27] migration: extend migration_bitmap, Juan Quintela, 2015/07/02
- Re: [Qemu-devel] [PULL v2 00/27] Migration pull request, Peter Maydell, 2015/07/02