[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/5] migration: Create load_setup()/cleanup() method
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 3/5] migration: Create load_setup()/cleanup() methods |
Date: |
Fri, 2 Jun 2017 00:15:50 +0200 |
We need to do things at load time.
Signed-off-by: Juan Quintela <address@hidden>
---
include/migration/register.h | 2 ++
migration/savevm.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/include/migration/register.h b/include/migration/register.h
index 8e37185..0862bb8 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -42,6 +42,8 @@ typedef struct SaveVMHandlers {
uint64_t *non_postcopiable_pending,
uint64_t *postcopiable_pending);
LoadStateHandler *load_state;
+ int (*load_setup)(QEMUFile *f, void *opaque);
+ int (*load_cleanup)(void *opaque);
} SaveVMHandlers;
int register_savevm(DeviceState *dev,
diff --git a/migration/savevm.c b/migration/savevm.c
index 0ec2cb0..1e5dfad 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1928,6 +1928,31 @@ qemu_loadvm_section_part_end(QEMUFile *f,
MigrationIncomingState *mis)
return 0;
}
+static int qemu_savevm_load_state_begin(QEMUFile *f)
+{
+ SaveStateEntry *se;
+ int ret;
+
+ trace_savevm_state_begin();
+ QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
+ if (!se->ops || !se->ops->load_setup) {
+ continue;
+ }
+ if (se->ops && se->ops->is_active) {
+ if (!se->ops->is_active(se->opaque)) {
+ continue;
+ }
+ }
+
+ ret = se->ops->load_setup(f, se->opaque);
+ if (ret < 0) {
+ qemu_file_set_error(f, ret);
+ return ret;
+ }
+ }
+ return 0;
+}
+
static int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis)
{
uint8_t section_type;
@@ -2000,6 +2025,12 @@ int qemu_loadvm_state(QEMUFile *f)
return -ENOTSUP;
}
+
+ if (qemu_savevm_load_state_begin(f) != 0) {
+ error_report("Load state of one device failed");
+ return -EINVAL;
+ }
+
if (!savevm_state.skip_configuration || enforce_config_section()) {
if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) {
error_report("Configuration section missing");
--
2.9.4
- [Qemu-devel] [PATCH 0/5] Create setup/cleanup methods for migration incoming side, Juan Quintela, 2017/06/01
- [Qemu-devel] [PATCH 1/5] migration: Rename save_live_setup() to save_setup(), Juan Quintela, 2017/06/01
- [Qemu-devel] [PATCH 2/5] migration: Rename cleanup() to save_cleanup(), Juan Quintela, 2017/06/01
- [Qemu-devel] [PATCH 3/5] migration: Create load_setup()/cleanup() methods,
Juan Quintela <=
- [Qemu-devel] [PATCH 4/5] migration: Convert ram to use new load_setup()/load_cleanup(), Juan Quintela, 2017/06/01
- [Qemu-devel] [PATCH 5/5] migration: Make compression_threads use save/load_setup/cleanup(), Juan Quintela, 2017/06/01
- Re: [Qemu-devel] [PATCH 0/5] Create setup/cleanup methods for migration incoming side, Juan Quintela, 2017/06/07