[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/18] migration: Create migration_ioc_process_incomi
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 01/18] migration: Create migration_ioc_process_incoming() |
Date: |
Fri, 22 Sep 2017 01:07:55 +0200 |
We pass the ioc instead of the fd. This will allow us to have more
than one channel open. We also make sure that we set the
from_src_file sooner, so we don't need to pass it as a parameter.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
--
Do not assing mis->from_src_file (peterxu)
---
migration/channel.c | 3 +--
migration/migration.c | 22 ++++++++++++++++++----
migration/migration.h | 2 ++
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/migration/channel.c b/migration/channel.c
index 3b7252f5a2..edceebdb7b 100644
--- a/migration/channel.c
+++ b/migration/channel.c
@@ -36,8 +36,7 @@ void migration_channel_process_incoming(QIOChannel *ioc)
error_report_err(local_err);
}
} else {
- QEMUFile *f = qemu_fopen_channel_input(ioc);
- migration_fd_process_incoming(f);
+ migration_ioc_process_incoming(ioc);
}
}
diff --git a/migration/migration.c b/migration/migration.c
index 959e8ec88e..2d4c56e612 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -306,17 +306,16 @@ static void process_incoming_migration_bh(void *opaque)
static void process_incoming_migration_co(void *opaque)
{
- QEMUFile *f = opaque;
MigrationIncomingState *mis = migration_incoming_get_current();
PostcopyState ps;
int ret;
- mis->from_src_file = f;
+ assert(mis->from_src_file);
mis->largest_page_size = qemu_ram_pagesize_largest();
postcopy_state_set(POSTCOPY_INCOMING_NONE);
migrate_set_state(&mis->state, MIGRATION_STATUS_NONE,
MIGRATION_STATUS_ACTIVE);
- ret = qemu_loadvm_state(f);
+ ret = qemu_loadvm_state(mis->from_src_file);
ps = postcopy_state_get();
trace_process_incoming_migration_co_end(ret, ps);
@@ -364,12 +363,27 @@ static void process_incoming_migration_co(void *opaque)
void migration_fd_process_incoming(QEMUFile *f)
{
- Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, f);
+ Coroutine *co = qemu_coroutine_create(process_incoming_migration_co, NULL);
+ MigrationIncomingState *mis = migration_incoming_get_current();
+ if (!mis->from_src_file) {
+ mis->from_src_file = f;
+ }
qemu_file_set_blocking(f, false);
qemu_coroutine_enter(co);
}
+void migration_ioc_process_incoming(QIOChannel *ioc)
+{
+ MigrationIncomingState *mis = migration_incoming_get_current();
+
+ if (!mis->from_src_file) {
+ QEMUFile *f = qemu_fopen_channel_input(ioc);
+ migration_fd_process_incoming(f);
+ }
+ /* We still only have a single channel. Nothing to do here yet */
+}
+
/*
* Send a 'SHUT' message on the return channel with the given value
* to indicate that we've finished with the RP. Non-0 value indicates
diff --git a/migration/migration.h b/migration/migration.h
index 148c9facbc..99c398d484 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -20,6 +20,7 @@
#include "exec/cpu-common.h"
#include "qemu/coroutine_int.h"
#include "hw/qdev.h"
+#include "io/channel.h"
/* State for the incoming migration */
struct MigrationIncomingState {
@@ -152,6 +153,7 @@ struct MigrationState
void migrate_set_state(int *state, int old_state, int new_state);
void migration_fd_process_incoming(QEMUFile *f);
+void migration_ioc_process_incoming(QIOChannel *ioc);
uint64_t migrate_max_downtime(void);
--
2.13.5
- [Qemu-devel] [PULL 00/18] Migration PULL request, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 01/18] migration: Create migration_ioc_process_incoming(),
Juan Quintela <=
- [Qemu-devel] [PULL 02/18] migration: Teach it about G_SOURCE_REMOVE, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 03/18] migration: Add comments to channel functions, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 04/18] migration: Create migration_has_all_channels, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 06/18] migration: Create x-multifd-channels parameter, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 05/18] migration: Add multifd capability, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 07/18] migration: Create x-multifd-page-count parameter, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 08/18] migration: Create multifd migration threads, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 10/18] bitmap: remove BITOP_WORD(), Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 09/18] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 11/18] bitmap: introduce bitmap_count_one(), Juan Quintela, 2017/09/21