Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> wrote: > There would be savevm states (dirty-bitmap) which can migrate only in > postcopy stage. The corresponding pending is introduced here. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > --- > include/migration/vmstate.h | 5 +++-- > include/sysemu/sysemu.h | 5 +++-- > migration/block.c | 7 ++++--- > migration/migration.c | 15 ++++++++------- > migration/ram.c | 9 +++++---- > migration/savevm.c | 12 +++++++----- > migration/trace-events | 2 +- > 7 files changed, 31 insertions(+), 24 deletions(-) > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index 5c30ef7..dc656be 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -58,8 +58,9 @@ typedef struct SaveVMHandlers { > /* This runs outside the iothread lock! */ > int (*save_live_setup)(QEMUFile *f, void *opaque); > void (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size, > - uint64_t *non_postcopiable_pending, > - uint64_t *postcopiable_pending); > + uint64_t *res_precopy_only, > + uint64_t *res_compatible, > + uint64_t *res_postcopy_only);
Ouch, we really need to move to use an struct here :p But ugliness was already here. BTW, with only this patch, it is not clear to me what res_compatible mean > @@ -1133,7 +1135,7 @@ void qemu_savevm_state_pending(QEMUFile *f, uint64_t > max_size, > } > } > se->ops->save_live_pending(f, se->opaque, max_size, > - res_non_postcopiable, res_postcopiable); > + res_precopy_only, res_compatible, res_postcopy_only); Indentation is wrong.