Message ID | 20170613095338.11560-4-quintela@redhat.com |
---|---|
State | New |
Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > We need to do things at load time and at cleanup time. > > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > include/migration/register.h | 2 ++ > migration/savevm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ > migration/trace-events | 2 ++ > 3 files changed, 48 insertions(+) > > diff --git a/include/migration/register.h b/include/migration/register.h > index 9ad1e4c..4b5c0e0 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_live(DeviceState *dev, > diff --git a/migration/savevm.c b/migration/savevm.c > index fb93931..ed36f35 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -1912,6 +1912,43 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis) > return 0; > } > > +static int qemu_loadvm_state_setup(QEMUFile *f) > +{ > + SaveStateEntry *se; > + int ret; > + > + trace_loadvm_state_setup(); > + 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 void qemu_loadvm_state_cleanup(void) > +{ > + SaveStateEntry *se; > + > + trace_loadvm_state_cleanup(); > + QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { > + if (se->ops && se->ops->load_cleanup) { > + se->ops->load_cleanup(se->opaque); > + } > + } > +} > + > static int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis) > { > uint8_t section_type; > @@ -1984,6 +2021,12 @@ int qemu_loadvm_state(QEMUFile *f) > return -ENOTSUP; > } > > + > + if (qemu_loadvm_state_setup(f) != 0) { > + error_report("Load state of one device failed"); > + return -EINVAL; I'd prefer if that was an error report in qemu_loadvm_state_setup, because then it would be easy to print the device name rather than 'one'. Dave > + } > + > if (!savevm_state.skip_configuration || enforce_config_section()) { > if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) { > error_report("Configuration section missing"); > @@ -2047,6 +2090,7 @@ int qemu_loadvm_state(QEMUFile *f) > } > } > > + qemu_loadvm_state_cleanup(); > cpu_synchronize_all_post_init(); > > return ret; > diff --git a/migration/trace-events b/migration/trace-events > index 9669e94..cb2c4b5 100644 > --- a/migration/trace-events > +++ b/migration/trace-events > @@ -7,6 +7,8 @@ qemu_loadvm_state_section_partend(uint32_t section_id) "%u" > qemu_loadvm_state_post_main(int ret) "%d" > qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u" > qemu_savevm_send_packaged(void) "" > +loadvm_state_setup(void) "" > +loadvm_state_cleanup(void) "" > loadvm_handle_cmd_packaged(unsigned int length) "%u" > loadvm_handle_cmd_packaged_main(int ret) "%d" > loadvm_handle_cmd_packaged_received(int ret) "%d" > -- > 2.9.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/migration/register.h b/include/migration/register.h index 9ad1e4c..4b5c0e0 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_live(DeviceState *dev, diff --git a/migration/savevm.c b/migration/savevm.c index fb93931..ed36f35 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1912,6 +1912,43 @@ qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis) return 0; } +static int qemu_loadvm_state_setup(QEMUFile *f) +{ + SaveStateEntry *se; + int ret; + + trace_loadvm_state_setup(); + 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 void qemu_loadvm_state_cleanup(void) +{ + SaveStateEntry *se; + + trace_loadvm_state_cleanup(); + QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { + if (se->ops && se->ops->load_cleanup) { + se->ops->load_cleanup(se->opaque); + } + } +} + static int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis) { uint8_t section_type; @@ -1984,6 +2021,12 @@ int qemu_loadvm_state(QEMUFile *f) return -ENOTSUP; } + + if (qemu_loadvm_state_setup(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"); @@ -2047,6 +2090,7 @@ int qemu_loadvm_state(QEMUFile *f) } } + qemu_loadvm_state_cleanup(); cpu_synchronize_all_post_init(); return ret; diff --git a/migration/trace-events b/migration/trace-events index 9669e94..cb2c4b5 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -7,6 +7,8 @@ qemu_loadvm_state_section_partend(uint32_t section_id) "%u" qemu_loadvm_state_post_main(int ret) "%d" qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u" qemu_savevm_send_packaged(void) "" +loadvm_state_setup(void) "" +loadvm_state_cleanup(void) "" loadvm_handle_cmd_packaged(unsigned int length) "%u" loadvm_handle_cmd_packaged_main(int ret) "%d" loadvm_handle_cmd_packaged_received(int ret) "%d"
We need to do things at load time and at cleanup time. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/register.h | 2 ++ migration/savevm.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ migration/trace-events | 2 ++ 3 files changed, 48 insertions(+)