[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v9 01/14] migration: Add post_save function to VMState
From: |
Aaron Lindsay |
Subject: |
[Qemu-arm] [PATCH v9 01/14] migration: Add post_save function to VMStateDescription |
Date: |
Wed, 5 Dec 2018 13:43:14 +0000 |
In some cases it may be helpful to modify state before saving it for
migration, and then modify the state back after it has been saved. The
existing pre_save function provides half of this functionality. This
patch adds a post_save function to provide the second half.
Signed-off-by: Aaron Lindsay <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
docs/devel/migration.rst | 9 +++++++--
include/migration/vmstate.h | 1 +
migration/vmstate.c | 13 ++++++++++++-
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst
index e7658ab050..220059679a 100644
--- a/docs/devel/migration.rst
+++ b/docs/devel/migration.rst
@@ -419,8 +419,13 @@ The functions to do that are inside a vmstate definition,
and are called:
This function is called before we save the state of one device.
-Example: You can look at hpet.c, that uses the three function to
-massage the state that is transferred.
+- ``int (*post_save)(void *opaque);``
+
+ This function is called after we save the state of one device
+ (even upon failure, unless the call to pre_save returned an error).
+
+Example: You can look at hpet.c, that uses the first three functions
+to massage the state that is transferred.
The ``VMSTATE_WITH_TMP`` macro may be useful when the migration
data doesn't match the stored device data well; it allows an
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 61bef3ef5c..067b126cf1 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -185,6 +185,7 @@ struct VMStateDescription {
int (*pre_load)(void *opaque);
int (*post_load)(void *opaque, int version_id);
int (*pre_save)(void *opaque);
+ int (*post_save)(void *opaque);
bool (*needed)(void *opaque);
const VMStateField *fields;
const VMStateDescription **subsections;
diff --git a/migration/vmstate.c b/migration/vmstate.c
index 80b59009aa..e2bbb7b5f7 100644
--- a/migration/vmstate.c
+++ b/migration/vmstate.c
@@ -390,6 +390,9 @@ int vmstate_save_state_v(QEMUFile *f, const
VMStateDescription *vmsd,
if (ret) {
error_report("Save of field %s/%s failed",
vmsd->name, field->name);
+ if (vmsd->post_save) {
+ vmsd->post_save(opaque);
+ }
return ret;
}
@@ -415,7 +418,15 @@ int vmstate_save_state_v(QEMUFile *f, const
VMStateDescription *vmsd,
json_end_array(vmdesc);
}
- return vmstate_subsection_save(f, vmsd, opaque, vmdesc);
+ ret = vmstate_subsection_save(f, vmsd, opaque, vmdesc);
+
+ if (vmsd->post_save) {
+ int ps_ret = vmsd->post_save(opaque);
+ if (!ret) {
+ ret = ps_ret;
+ }
+ }
+ return ret;
}
static const VMStateDescription *
--
2.19.1
- [Qemu-arm] [PATCH v9 00/14] More fully implement ARM PMUv3, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 01/14] migration: Add post_save function to VMStateDescription,
Aaron Lindsay <=
- [Qemu-arm] [PATCH v9 03/14] target/arm: Swap PMU values before/after migrations, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 02/14] target/arm: Reorganize PMCCNTR accesses, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 04/14] target/arm: Filter cycle counter based on PMCCFILTR_EL0, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 05/14] target/arm: Allow AArch32 access for PMCCFILTR, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 07/14] target/arm: Define FIELDs for ID_DFR0, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 06/14] target/arm: Implement PMOVSSET, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 09/14] target/arm: Add array for supported PMU events, generate PMCEID[01]_EL0, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 12/14] target/arm: PMU: Set PMCR.N to 4, Aaron Lindsay, 2018/12/05
- [Qemu-arm] [PATCH v9 10/14] target/arm: Finish implementation of PM[X]EVCNTR and PM[X]EVTYPER, Aaron Lindsay, 2018/12/05