[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/15] migration: move income process out of multifd
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 02/15] migration: move income process out of multifd |
Date: |
Tue, 10 Jul 2018 16:30:03 +0100 |
From: Peter Xu <address@hidden>
Move the call to migration_incoming_process() out of multifd code. It's
a bit strange that we can migration generic calls in multifd code.
Instead, let multifd_recv_new_channel() return a boolean showing whether
it's ready to continue the incoming migration.
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/migration.c | 5 ++++-
migration/ram.c | 11 +++++------
migration/ram.h | 2 +-
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 94d71f8b24..aea6fb7444 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -507,7 +507,10 @@ void migration_ioc_process_incoming(QIOChannel *ioc)
migration_incoming_setup(f);
return;
}
- multifd_recv_new_channel(ioc);
+
+ if (multifd_recv_new_channel(ioc)) {
+ migration_incoming_process();
+ }
}
/**
diff --git a/migration/ram.c b/migration/ram.c
index 1cd98d6398..23cea47090 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1311,7 +1311,8 @@ bool multifd_recv_all_channels_created(void)
return thread_count == atomic_read(&multifd_recv_state->count);
}
-void multifd_recv_new_channel(QIOChannel *ioc)
+/* Return true if multifd is ready for the migration, otherwise false */
+bool multifd_recv_new_channel(QIOChannel *ioc)
{
MultiFDRecvParams *p;
Error *local_err = NULL;
@@ -1320,7 +1321,7 @@ void multifd_recv_new_channel(QIOChannel *ioc)
id = multifd_recv_initial_packet(ioc, &local_err);
if (id < 0) {
multifd_recv_terminate_threads(local_err);
- return;
+ return false;
}
p = &multifd_recv_state->params[id];
@@ -1328,7 +1329,7 @@ void multifd_recv_new_channel(QIOChannel *ioc)
error_setg(&local_err, "multifd: received id '%d' already setup'",
id);
multifd_recv_terminate_threads(local_err);
- return;
+ return false;
}
p->c = ioc;
object_ref(OBJECT(ioc));
@@ -1339,9 +1340,7 @@ void multifd_recv_new_channel(QIOChannel *ioc)
qemu_thread_create(&p->thread, p->name, multifd_recv_thread, p,
QEMU_THREAD_JOINABLE);
atomic_inc(&multifd_recv_state->count);
- if (multifd_recv_state->count == migrate_multifd_channels()) {
- migration_incoming_process();
- }
+ return multifd_recv_state->count == migrate_multifd_channels();
}
/**
diff --git a/migration/ram.h b/migration/ram.h
index d386f4d641..457bf54b8c 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -46,7 +46,7 @@ int multifd_save_cleanup(Error **errp);
int multifd_load_setup(void);
int multifd_load_cleanup(Error **errp);
bool multifd_recv_all_channels_created(void);
-void multifd_recv_new_channel(QIOChannel *ioc);
+bool multifd_recv_new_channel(QIOChannel *ioc);
uint64_t ram_pagesize_summary(void);
int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len);
--
2.17.1
- [Qemu-devel] [PULL 00/15] migration queue, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 03/15] migration: unbreak postcopy recovery, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 01/15] migration: delay postcopy paused state, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 04/15] migration: unify incoming processing, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 02/15] migration: move income process out of multifd,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 05/15] migration: simplify check to use qemu file buffer, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 06/15] migration: loosen recovery check when load vm, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 07/15] migration: fix incorrect bitmap size calculation, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 08/15] migration: show pause/recover state on dst host, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 09/15] tests: introduce migrate_postcopy_* helpers, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 11/15] tests: introduce migrate_query*() helpers, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 12/15] tests: introduce wait_for_migration_status(), Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 10/15] tests: allow migrate() to take extra flags, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 13/15] tests: add postcopy recovery test, Dr. David Alan Gilbert (git), 2018/07/10
- [Qemu-devel] [PULL 14/15] tests: hide stderr for postcopy recovery test, Dr. David Alan Gilbert (git), 2018/07/10