From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4jsX-00052x-II for qemu-devel@nongnu.org; Mon, 23 May 2016 03:02:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b4jsS-0001W0-Mo for qemu-devel@nongnu.org; Mon, 23 May 2016 03:02:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58272) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b4jsS-0001Vt-HB for qemu-devel@nongnu.org; Mon, 23 May 2016 03:02:12 -0400 Date: Mon, 23 May 2016 12:32:08 +0530 From: Amit Shah Message-ID: <20160523070208.GA24417@grmbl.mre> References: <1463489755-30703-1-git-send-email-dgilbert@redhat.com> <1463489755-30703-3-git-send-email-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1463489755-30703-3-git-send-email-dgilbert@redhat.com> Subject: Re: [Qemu-devel] [PATCH v4 2/6] Migration: Split out ram part of qmp_query_migrate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: qemu-devel@nongnu.org, quintela@redhat.com, aarcange@redhat.com, den@openvz.org, marcel.a@redhat.com On (Tue) 17 May 2016 [13:55:51], Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > The RAM section of qmp_query_migrate is reasonably complex > and repeated 3 times. Split it out into a helper. > > Signed-off-by: Dr. David Alan Gilbert > Reviewed-by: Eric Blake > Reviwed-by: Denis V. Lunev > --- > migration/migration.c | 57 ++++++++++++++++++++------------------------------- > 1 file changed, 22 insertions(+), 35 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 991313a..bfb326d 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -561,6 +561,25 @@ static void get_xbzrle_cache_stats(MigrationInfo *info) > } > } > > +static void populate_ram_info(MigrationInfo *info, MigrationState *s) > +{ > + info->has_ram = true; > + info->ram = g_malloc0(sizeof(*info->ram)); > + info->ram->transferred = ram_bytes_transferred(); > + info->ram->total = ram_bytes_total(); > + info->ram->duplicate = dup_mig_pages_transferred(); > + info->ram->skipped = skipped_mig_pages_transferred(); > + info->ram->normal = norm_mig_pages_transferred(); > + info->ram->normal_bytes = norm_mig_bytes_transferred(); > + info->ram->mbps = s->mbps; > + info->ram->dirty_sync_count = s->dirty_sync_count; > + > + if (s->state != MIGRATION_STATUS_COMPLETED) { > + info->ram->remaining = ram_bytes_remaining(); > + info->ram->dirty_pages_rate = s->dirty_pages_rate; In the 'else' case, shouldn't these be set to 0? Amit