[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 11/28] migration: pass MigrationState to migrate_
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v5 11/28] migration: pass MigrationState to migrate_init() |
Date: |
Tue, 5 Dec 2017 14:52:50 +0800 |
Let the callers take the object, then pass it to migrate_init().
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 7 ++-----
migration/migration.h | 2 +-
migration/savevm.c | 5 ++++-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index ad4cbfc820..96b3c25505 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1265,10 +1265,8 @@ bool migration_is_idle(void)
return false;
}
-MigrationState *migrate_init(void)
+void migrate_init(MigrationState *s)
{
- MigrationState *s = migrate_get_current();
-
/*
* Reinitialise all migration state, except
* parameters/capabilities that the user set, and
@@ -1294,7 +1292,6 @@ MigrationState *migrate_init(void)
migrate_set_state(&s->state, MIGRATION_STATUS_NONE,
MIGRATION_STATUS_SETUP);
s->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
- return s;
}
static GSList *migration_blockers;
@@ -1402,7 +1399,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
migrate_set_block_incremental(s, true);
}
- s = migrate_init();
+ migrate_init(s);
if (strstart(uri, "tcp:", &p)) {
tcp_start_outgoing_migration(s, p, &local_err);
diff --git a/migration/migration.h b/migration/migration.h
index 2751b2dffc..d052669e1c 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -180,7 +180,7 @@ void migrate_fd_error(MigrationState *s, const Error
*error);
void migrate_fd_connect(MigrationState *s);
-MigrationState *migrate_init(void);
+void migrate_init(MigrationState *s);
bool migration_is_blocked(Error **errp);
/* True if outgoing migration has entered postcopy phase */
bool migration_in_postcopy(void);
diff --git a/migration/savevm.c b/migration/savevm.c
index ee03fb5c32..0dda7ca2b4 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1256,8 +1256,11 @@ void qemu_savevm_state_cleanup(void)
static int qemu_savevm_state(QEMUFile *f, Error **errp)
{
int ret;
- MigrationState *ms = migrate_init();
+ MigrationState *ms = migrate_get_current();
MigrationStatus status;
+
+ migrate_init(ms);
+
ms->to_dst_file = f;
if (migration_is_blocked(errp)) {
--
2.14.3
- [Qemu-devel] [PATCH v5 03/28] migration: provide postcopy_fault_thread_notify(), (continued)
- [Qemu-devel] [PATCH v5 03/28] migration: provide postcopy_fault_thread_notify(), Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 04/28] migration: new postcopy-pause state, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 05/28] migration: implement "postcopy-pause" src logic, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 07/28] migration: allow src return path to pause, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 06/28] migration: allow dst vm pause on postcopy, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 08/28] migration: allow send_rq to fail, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 09/28] migration: allow fault thread to pause, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 10/28] qmp: hmp: add migrate "resume" option, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 11/28] migration: pass MigrationState to migrate_init(),
Peter Xu <=
- [Qemu-devel] [PATCH v5 12/28] migration: rebuild channel on source, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 13/28] migration: new state "postcopy-recover", Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 14/28] migration: wakeup dst ram-load-thread for recover, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 15/28] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 16/28] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 17/28] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 18/28] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 19/28] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 20/28] migration: synchronize dirty bitmap for resume, Peter Xu, 2017/12/05
- [Qemu-devel] [PATCH v5 22/28] migration: final handshake for the resume, Peter Xu, 2017/12/05