[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 15/24] migration: introduce SaveVMHandlers.resume
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v8 15/24] migration: introduce SaveVMHandlers.resume_prepare |
Date: |
Wed, 2 May 2018 18:47:31 +0800 |
This is hook function to be called when a postcopy migration wants to
resume from a failure. For each module, it should provide its own
recovery logic before we switch to the postcopy-active state.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
include/migration/register.h | 2 ++
migration/savevm.h | 1 +
migration/migration.c | 20 +++++++++++++++++++-
migration/savevm.c | 25 +++++++++++++++++++++++++
migration/trace-events | 1 +
5 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/include/migration/register.h b/include/migration/register.h
index f6f12f9b1a..d287f4c317 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -64,6 +64,8 @@ typedef struct SaveVMHandlers {
LoadStateHandler *load_state;
int (*load_setup)(QEMUFile *f, void *opaque);
int (*load_cleanup)(void *opaque);
+ /* Called when postcopy migration wants to resume from failure */
+ int (*resume_prepare)(MigrationState *s, void *opaque);
} SaveVMHandlers;
int register_savevm_live(DeviceState *dev,
diff --git a/migration/savevm.h b/migration/savevm.h
index b24ff073ad..a5e65b8ae3 100644
--- a/migration/savevm.h
+++ b/migration/savevm.h
@@ -31,6 +31,7 @@
bool qemu_savevm_state_blocked(Error **errp);
void qemu_savevm_state_setup(QEMUFile *f);
+int qemu_savevm_state_resume_prepare(MigrationState *s);
void qemu_savevm_state_header(QEMUFile *f);
int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy);
void qemu_savevm_state_cleanup(void);
diff --git a/migration/migration.c b/migration/migration.c
index ac1780e8f0..a8c50783f7 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2449,7 +2449,25 @@ typedef enum MigThrError {
/* Return zero if success, or <0 for error */
static int postcopy_do_resume(MigrationState *s)
{
- /* TODO: do the resume logic */
+ int ret;
+
+ /*
+ * Call all the resume_prepare() hooks, so that modules can be
+ * ready for the migration resume.
+ */
+ ret = qemu_savevm_state_resume_prepare(s);
+ if (ret) {
+ error_report("%s: resume_prepare() failure detected: %d",
+ __func__, ret);
+ return ret;
+ }
+
+ /*
+ * TODO: handshake with dest using MIG_CMD_RESUME,
+ * MIG_RP_MSG_RESUME_ACK, then switch source state to
+ * "postcopy-active"
+ */
+
return 0;
}
diff --git a/migration/savevm.c b/migration/savevm.c
index 6a2d77cbf3..8e7653badc 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1031,6 +1031,31 @@ void qemu_savevm_state_setup(QEMUFile *f)
}
}
+int qemu_savevm_state_resume_prepare(MigrationState *s)
+{
+ SaveStateEntry *se;
+ int ret;
+
+ trace_savevm_state_resume_prepare();
+
+ QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
+ if (!se->ops || !se->ops->resume_prepare) {
+ continue;
+ }
+ if (se->ops && se->ops->is_active) {
+ if (!se->ops->is_active(se->opaque)) {
+ continue;
+ }
+ }
+ ret = se->ops->resume_prepare(s, se->opaque);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
/*
* this function has three return values:
* negative: there was one error, and we have -errno.
diff --git a/migration/trace-events b/migration/trace-events
index 40a7217829..be36fbccfe 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -39,6 +39,7 @@ savevm_send_postcopy_run(void) ""
savevm_send_postcopy_resume(void) ""
savevm_send_recv_bitmap(char *name) "%s"
savevm_state_setup(void) ""
+savevm_state_resume_prepare(void) ""
savevm_state_header(void) ""
savevm_state_iterate(void) ""
savevm_state_cleanup(void) ""
--
2.14.3
- [Qemu-devel] [PATCH v8 05/24] migration: allow src return path to pause, (continued)
- [Qemu-devel] [PATCH v8 05/24] migration: allow src return path to pause, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 06/24] migration: allow fault thread to pause, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 08/24] migration: rebuild channel on source, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 07/24] qmp: hmp: add migrate "resume" option, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 09/24] migration: new state "postcopy-recover", Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 10/24] migration: wakeup dst ram-load-thread for recover, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 11/24] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 12/24] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 13/24] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 14/24] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 15/24] migration: introduce SaveVMHandlers.resume_prepare,
Peter Xu <=
- [Qemu-devel] [PATCH v8 16/24] migration: synchronize dirty bitmap for resume, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 17/24] migration: setup ramstate for resume, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 18/24] migration: final handshake for the resume, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 19/24] migration: init dst in migration_object_init too, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 20/24] qmp/migration: new command migrate-recover, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 21/24] hmp/migration: add migrate_recover command, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 22/24] migration: introduce lock for to_dst_file, Peter Xu, 2018/05/02
- [Qemu-devel] [PATCH v8 23/24] migration/qmp: add command migrate-pause, Peter Xu, 2018/05/02