| Message ID | 1471343175-14945-3-git-send-email-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
* Vladimir Sementsov-Ogievskiy (vsementsov@virtuozzo.com) wrote: > Fill postcopy-able pending only if ram postcopy is enabled. > It is necessary because of there will be other postcopy-able states and > when ram postcopy is disabled, it should not spoil common postcopy > related pending. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > migration/ram.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/migration/ram.c b/migration/ram.c > index fa5c72b..424ce0b 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2079,8 +2079,12 @@ static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, > remaining_size = ram_save_remaining() * TARGET_PAGE_SIZE; > } > > - /* We can do postcopy, and all the data is postcopiable */ > - *postcopiable_pending += remaining_size; > + if (migrate_postcopy_ram()) { > + /* We can do postcopy, and all the data is postcopiable */ > + *postcopiable_pending += remaining_size; > + } else { > + *non_postcopiable_pending += remaining_size; > + } > } > > static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) > -- > 1.8.3.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> wrote: > Fill postcopy-able pending only if ram postcopy is enabled. > It is necessary because of there will be other postcopy-able states and > when ram postcopy is disabled, it should not spoil common postcopy > related pending. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Juan Quintela <quintela@redhat.com>
diff --git a/migration/ram.c b/migration/ram.c index fa5c72b..424ce0b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2079,8 +2079,12 @@ static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, remaining_size = ram_save_remaining() * TARGET_PAGE_SIZE; } - /* We can do postcopy, and all the data is postcopiable */ - *postcopiable_pending += remaining_size; + if (migrate_postcopy_ram()) { + /* We can do postcopy, and all the data is postcopiable */ + *postcopiable_pending += remaining_size; + } else { + *non_postcopiable_pending += remaining_size; + } } static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host)
Fill postcopy-able pending only if ram postcopy is enabled. It is necessary because of there will be other postcopy-able states and when ram postcopy is disabled, it should not spoil common postcopy related pending. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- migration/ram.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)