[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 11/32] migration: pass MigrationState to migrate_
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v3 11/32] migration: pass MigrationState to migrate_init() |
Date: |
Mon, 16 Oct 2017 14:51:55 +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 059c9cc334..3a734e9dda 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1220,10 +1220,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
@@ -1251,7 +1249,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;
@@ -1359,7 +1356,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 b9bc617175..9502b2aad6 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -173,7 +173,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 86ada6d0e7..6d6f8ee3e4 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.13.5
- [Qemu-devel] [PATCH v3 01/32] migration: better error handling with QEMUFile, (continued)
- [Qemu-devel] [PATCH v3 01/32] migration: better error handling with QEMUFile, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 02/32] migration: reuse mis->userfault_quit_fd, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 03/32] migration: provide postcopy_fault_thread_notify(), Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 04/32] migration: new postcopy-pause state, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 05/32] migration: implement "postcopy-pause" src logic, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 06/32] migration: allow dst vm pause on postcopy, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 07/32] migration: allow src return path to pause, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 08/32] migration: allow send_rq to fail, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 09/32] migration: allow fault thread to pause, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 10/32] qmp: hmp: add migrate "resume" option, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 11/32] migration: pass MigrationState to migrate_init(),
Peter Xu <=
- [Qemu-devel] [PATCH v3 12/32] migration: rebuild channel on source, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 13/32] migration: new state "postcopy-recover", Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 14/32] migration: wakeup dst ram-load-thread for recover, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 15/32] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 16/32] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 17/32] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 18/32] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 19/32] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 20/32] migration: synchronize dirty bitmap for resume, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 21/32] migration: setup ramstate for resume, Peter Xu, 2017/10/16