Peter Xu <pet...@redhat.com> wrote: > On Thu, Jun 01, 2017 at 11:29:13PM +0200, Juan Quintela wrote: >> They are indpendent, and nowadays almost every device register things >> with qdev->vmsd. >> >> Signed-off-by: Juan Quintela <quint...@redhat.com>
>> + >> +int register_savevm(DeviceState *dev, >> + const char *idstr, >> + int instance_id, >> + int version_id, >> + SaveStateHandler *save_state, >> + LoadStateHandler *load_state, >> + void *opaque); > > Looks like this patch needs a rebasing since this function is already > remove... > >> + >> +int register_savevm_live(DeviceState *dev, >> + const char *idstr, >> + int instance_id, >> + int version_id, >> + SaveVMHandlers *ops, >> + void *opaque); >> + >> +void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque); >> + >> +#endif >> diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h >> index b95c9bb..6de554d 100644 >> --- a/include/migration/vmstate.h >> +++ b/include/migration/vmstate.h >> @@ -29,53 +29,8 @@ >> >> #include "migration/qjson.h" >> >> -typedef void SaveStateHandler(QEMUFile *f, void *opaque); >> typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); > > Should be removed too? > > Other than mentioned above: > > Reviewed-by: Peter Xu <pet...@redhat.com> Local copy already have this two bits fixed. It is just that I posted this series before that changes got into upstream. Later, Juan.
