From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bZziF-0007YU-3T for qemu-devel@nongnu.org; Wed, 17 Aug 2016 08:12:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bZziD-0004uj-0n for qemu-devel@nongnu.org; Wed, 17 Aug 2016 08:12:49 -0400 Date: Wed, 17 Aug 2016 13:12:35 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20160817121235.GB2018@work-vm> References: <1471343175-14945-1-git-send-email-vsementsov@virtuozzo.com> <1471343175-14945-3-git-send-email-vsementsov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1471343175-14945-3-git-send-email-vsementsov@virtuozzo.com> Subject: Re: [Qemu-devel] [PATCH 02/18] migration: fix ram_save_pending List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Vladimir Sementsov-Ogievskiy Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, pbonzini@redhat.com, armbru@redhat.com, eblake@redhat.com, famz@redhat.com, stefanha@redhat.com, amit.shah@redhat.com, quintela@redhat.com, mreitz@redhat.com, kwolf@redhat.com, peter.maydell@linaro.org, den@openvz.org, jsnow@redhat.com, lirans@il.ibm.com * 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 Reviewed-by: Dr. David Alan Gilbert > --- > 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