From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: amit.shah@redhat.com
Subject: [Qemu-devel] [PATCH 08/11] migration: Use always helper to set state
Date: Wed, 17 Jun 2015 03:50:30 +0200 [thread overview]
Message-ID: <1434505833-11234-9-git-send-email-quintela@redhat.com> (raw)
In-Reply-To: <1434505833-11234-1-git-send-email-quintela@redhat.com>
There were three places that were not using the migrate_set_state()
helper, just fix that.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 1791185..1c84249 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -545,7 +545,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);
}
@@ -630,7 +630,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);
@@ -723,7 +723,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
#endif
} else {
error_set(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
next prev parent reply other threads:[~2015-06-17 1:50 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-17 1:50 [Qemu-devel] [PATCH 00/11] Migraiton events + optional sections Juan Quintela
2015-06-17 1:50 ` [Qemu-devel] [PATCH 01/11] runstate: Add runstate store Juan Quintela
2015-06-17 18:39 ` Dr. David Alan Gilbert
2015-06-17 1:50 ` [Qemu-devel] [PATCH 02/11] runstate: migration allows more transitions now Juan Quintela
2015-06-17 18:41 ` Dr. David Alan Gilbert
2015-06-17 1:50 ` [Qemu-devel] [PATCH 03/11] migration: create new section to store global state Juan Quintela
2015-06-17 19:00 ` Dr. David Alan Gilbert
2015-07-01 7:53 ` Juan Quintela
2015-06-17 1:50 ` [Qemu-devel] [PATCH 04/11] global_state: Make section optional Juan Quintela
2015-06-18 11:36 ` Dr. David Alan Gilbert
2015-06-17 1:50 ` [Qemu-devel] [PATCH 05/11] vmstate: Create optional sections Juan Quintela
2015-06-17 1:50 ` [Qemu-devel] [PATCH 06/11] migration: Add configuration section Juan Quintela
2015-06-18 10:27 ` Dr. David Alan Gilbert
2015-06-17 1:50 ` [Qemu-devel] [PATCH 07/11] migration: Use cmpxchg correctly Juan Quintela
2015-06-18 10:33 ` Dr. David Alan Gilbert
2015-06-17 1:50 ` Juan Quintela [this message]
2015-06-18 10:46 ` [Qemu-devel] [PATCH 08/11] migration: Use always helper to set state Dr. David Alan Gilbert
2015-07-01 7:33 ` Juan Quintela
2015-06-17 1:50 ` [Qemu-devel] [PATCH 09/11] migration: No need to call trace_migrate_set_state() Juan Quintela
2015-06-18 10:47 ` Dr. David Alan Gilbert
2015-06-17 1:50 ` [Qemu-devel] [PATCH 10/11] migration: create migration event Juan Quintela
2015-06-17 19:45 ` Eric Blake
2015-07-01 7:22 ` Juan Quintela
2015-06-17 1:50 ` [Qemu-devel] [PATCH 11/11] migration: Add migration events on target side Juan Quintela
2015-06-18 10:53 ` Dr. David Alan Gilbert
2015-06-18 12:19 ` Eric Blake
2015-06-18 12:51 ` Dr. David Alan Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434505833-11234-9-git-send-email-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=amit.shah@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.