From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Wei Yang <richardw.yang@linux.intel.com>
Cc: qemu-devel@nongnu.org, quintela@redhat.com
Subject: Re: [PATCH] migration: use migration_is_active to represent active state
Date: Fri, 11 Oct 2019 14:18:27 +0100 [thread overview]
Message-ID: <20191011131827.GA18007@work-vm> (raw)
In-Reply-To: <20191008122116.GC3441@work-vm>
* Dr. David Alan Gilbert (dgilbert@redhat.com) wrote:
> * Wei Yang (richardw.yang@linux.intel.com) wrote:
> > Wrap the check into a function to make it easy to read.
> >
> > Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
>
> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Queued
>
> > ---
> > include/migration/misc.h | 1 +
> > migration/migration.c | 12 ++++++++----
> > 2 files changed, 9 insertions(+), 4 deletions(-)
> >
> > diff --git a/include/migration/misc.h b/include/migration/misc.h
> > index 5cdbabd094..42d6abc920 100644
> > --- a/include/migration/misc.h
> > +++ b/include/migration/misc.h
> > @@ -61,6 +61,7 @@ void migration_object_init(void);
> > void migration_shutdown(void);
> > void qemu_start_incoming_migration(const char *uri, Error **errp);
> > bool migration_is_idle(void);
> > +bool migration_is_active(MigrationState *);
> > void add_migration_state_change_notifier(Notifier *notify);
> > void remove_migration_state_change_notifier(Notifier *notify);
> > bool migration_in_setup(MigrationState *);
> > diff --git a/migration/migration.c b/migration/migration.c
> > index 43fd8297ef..4c066fc85c 100644
> > --- a/migration/migration.c
> > +++ b/migration/migration.c
> > @@ -1529,8 +1529,7 @@ static void migrate_fd_cleanup(MigrationState *s)
> > qemu_fclose(tmp);
> > }
> >
> > - assert((s->state != MIGRATION_STATUS_ACTIVE) &&
> > - (s->state != MIGRATION_STATUS_POSTCOPY_ACTIVE));
> > + assert(!migration_is_active(s));
> >
> > if (s->state == MIGRATION_STATUS_CANCELLING) {
> > migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING,
> > @@ -1690,6 +1689,12 @@ bool migration_is_idle(void)
> > return false;
> > }
> >
> > +bool migration_is_active(MigrationState *s)
> > +{
> > + return (s->state == MIGRATION_STATUS_ACTIVE ||
> > + s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);
> > +}
> > +
> > void migrate_init(MigrationState *s)
> > {
> > /*
> > @@ -3226,8 +3231,7 @@ static void *migration_thread(void *opaque)
> >
> > trace_migration_thread_setup_complete();
> >
> > - while (s->state == MIGRATION_STATUS_ACTIVE ||
> > - s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE) {
> > + while (migration_is_active(s)) {
> > int64_t current_time;
> >
> > if (urgent || !qemu_file_rate_limit(s->to_dst_file)) {
> > --
> > 2.17.1
> >
> --
> Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
prev parent reply other threads:[~2019-10-11 13:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 0:53 [Qemu-devel] [PATCH] migration: use migration_is_active to represent active state Wei Yang
2019-09-13 23:54 ` Wei Yang
2019-10-01 9:17 ` Wei Yang
2019-10-08 12:21 ` Dr. David Alan Gilbert
2019-10-11 13:18 ` Dr. David Alan Gilbert [this message]
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=20191011131827.GA18007@work-vm \
--to=dgilbert@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richardw.yang@linux.intel.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).