From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org
Cc: quintela@redhat.com, peterx@redhat.com, armbru@redhat.com,
kwolf@redhat.com
Subject: [Qemu-devel] [PULL 5/8] runstate/migrate: Two more transitions
Date: Wed, 6 Sep 2017 19:41:30 +0100 [thread overview]
Message-ID: <20170906184133.25524-6-dgilbert@redhat.com> (raw)
In-Reply-To: <20170906184133.25524-1-dgilbert@redhat.com>
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
There's a race if someone does a 'stop' near the end of migrate;
the migration process goes through two runstates:
'finish migrate'
'postmigrate'
If the user issues a 'stop' between the two we end up with invalid
state transitions.
Add the transitions as valid.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170804175011.21944-1-dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
vl.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/vl.c b/vl.c
index e75757f977..fb1f05b937 100644
--- a/vl.c
+++ b/vl.c
@@ -621,6 +621,7 @@ static const RunStateTransition runstate_transitions_def[] = {
{ RUN_STATE_PAUSED, RUN_STATE_RUNNING },
{ RUN_STATE_PAUSED, RUN_STATE_FINISH_MIGRATE },
+ { RUN_STATE_PAUSED, RUN_STATE_POSTMIGRATE },
{ RUN_STATE_PAUSED, RUN_STATE_PRELAUNCH },
{ RUN_STATE_PAUSED, RUN_STATE_COLO},
@@ -633,6 +634,7 @@ static const RunStateTransition runstate_transitions_def[] = {
{ RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },
+ { RUN_STATE_FINISH_MIGRATE, RUN_STATE_PAUSED },
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_POSTMIGRATE },
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_PRELAUNCH },
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_COLO},
--
2.13.5
next prev parent reply other threads:[~2017-09-06 18:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-06 18:41 [Qemu-devel] [PULL 0/8] migration queue Dr. David Alan Gilbert (git)
2017-09-06 18:41 ` [Qemu-devel] [PULL 1/8] migration: Report when bdrv_inactivate_all fails Dr. David Alan Gilbert (git)
2017-09-06 18:41 ` [Qemu-devel] [PULL 2/8] xbzrle: Drop unused cache_resize() Dr. David Alan Gilbert (git)
2017-09-06 18:41 ` [Qemu-devel] [PULL 3/8] host-utils: Proactively fix pow2floor(), switch to unsigned Dr. David Alan Gilbert (git)
2017-09-06 18:41 ` [Qemu-devel] [PULL 4/8] host-utils: Simplify pow2ceil() Dr. David Alan Gilbert (git)
2017-09-06 18:41 ` Dr. David Alan Gilbert (git) [this message]
2017-09-06 18:41 ` [Qemu-devel] [PULL 6/8] migration: Reset rather than destroy main_thread_load_event Dr. David Alan Gilbert (git)
2017-09-06 18:41 ` [Qemu-devel] [PULL 7/8] snapshot/tests: Try loadvm twice Dr. David Alan Gilbert (git)
2017-09-06 18:41 ` [Qemu-devel] [PULL 8/8] migration: dump str in migrate_set_state trace Dr. David Alan Gilbert (git)
2017-09-07 15:38 ` [Qemu-devel] [PULL 0/8] migration queue Peter Maydell
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=20170906184133.25524-6-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).