From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dGqnU-0001ok-Tq for qemu-devel@nongnu.org; Fri, 02 Jun 2017 13:55:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dGqnR-0005oI-S9 for qemu-devel@nongnu.org; Fri, 02 Jun 2017 13:55:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32914) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dGqnR-0005n9-It for qemu-devel@nongnu.org; Fri, 02 Jun 2017 13:55:37 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 82A517F6A1 for ; Fri, 2 Jun 2017 17:55:35 +0000 (UTC) Date: Fri, 2 Jun 2017 18:55:30 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20170602175529.GE2081@work-vm> References: <20170601214056.30387-1-quintela@redhat.com> <20170601214056.30387-4-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170601214056.30387-4-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 3/4] ram: Print block stats also in the complete case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, lvivier@redhat.com, peterx@redhat.com * Juan Quintela (quintela@redhat.com) wrote: > To make things easier, I just moved it to populate_ram_info(). Blk is not RAM; better to create a separate function. Dave > Signed-off-by: Juan Quintela > --- > migration/migration.c | 26 ++++++++------------------ > 1 file changed, 8 insertions(+), 18 deletions(-) > > diff --git a/migration/migration.c b/migration/migration.c > index 7f79da0..8289544 100644 > --- a/migration/migration.c > +++ b/migration/migration.c > @@ -509,6 +509,14 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) > info->cpu_throttle_percentage = cpu_throttle_get_percentage(); > } > > + if (blk_mig_active()) { > + info->has_disk = true; > + info->disk = g_malloc0(sizeof(*info->disk)); > + info->disk->transferred = blk_mig_bytes_transferred(); > + info->disk->remaining = blk_mig_bytes_remaining(); > + info->disk->total = blk_mig_bytes_total(); > + } > + > if (s->state != MIGRATION_STATUS_COMPLETED) { > info->ram->remaining = ram_bytes_remaining(); > info->ram->dirty_pages_rate = ram_dirty_pages_rate(); > @@ -540,15 +548,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) > info->setup_time = s->setup_time; > > populate_ram_info(info, s); > - > - if (blk_mig_active()) { > - info->has_disk = true; > - info->disk = g_malloc0(sizeof(*info->disk)); > - info->disk->transferred = blk_mig_bytes_transferred(); > - info->disk->remaining = blk_mig_bytes_remaining(); > - info->disk->total = blk_mig_bytes_total(); > - } > - > break; > case MIGRATION_STATUS_POSTCOPY_ACTIVE: > /* Mostly the same as active; TODO add some postcopy stats */ > @@ -562,15 +561,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) > info->setup_time = s->setup_time; > > populate_ram_info(info, s); > - > - if (blk_mig_active()) { > - info->has_disk = true; > - info->disk = g_malloc0(sizeof(*info->disk)); > - info->disk->transferred = blk_mig_bytes_transferred(); > - info->disk->remaining = blk_mig_bytes_remaining(); > - info->disk->total = blk_mig_bytes_total(); > - } > - > break; > case MIGRATION_STATUS_COLO: > info->has_status = true; > -- > 2.9.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK