QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Wei Yang <richard.weiyang@gmail.com>
To: Wei Yang <richardw.yang@linux.intel.com>
Cc: quintela@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com
Subject: Re: [Qemu-devel] [PATCH] migration: use migration_is_active to represent active state
Date: Fri, 13 Sep 2019 23:54:33 +0000
Message-ID: <20190913235433.u66jqdhx4afnqae5@master> (raw)
In-Reply-To: <20190717005341.14140-1-richardw.yang@linux.intel.com>

On Wed, Jul 17, 2019 at 08:53:41AM +0800, Wei Yang wrote:
>Wrap the check into a function to make it easy to read.
>

Hi, Dave & Juan

Do you like this one :-) ?

>Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
>---
> 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
>

-- 
Wei Yang
Help you, Help me


      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-17  0:53 Wei Yang
2019-09-13 23:54 ` Wei Yang [this message]

Reply instructions:

You may reply publically 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=20190913235433.u66jqdhx4afnqae5@master \
    --to=richard.weiyang@gmail.com \
    --cc=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

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org qemu-devel@archiver.kernel.org
	public-inbox-index qemu-devel


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/ public-inbox