From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw9wq-00006x-Al for qemu-devel@nongnu.org; Fri, 29 Apr 2016 11:03:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aw9we-000564-AE for qemu-devel@nongnu.org; Fri, 29 Apr 2016 11:03:10 -0400 Received: from mail-am1on0134.outbound.protection.outlook.com ([157.56.112.134]:1641 helo=emea01-am1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw9wc-00053c-MY for qemu-devel@nongnu.org; Fri, 29 Apr 2016 11:03:04 -0400 References: <1461941263-9523-1-git-send-email-dgilbert@redhat.com> <1461941263-9523-3-git-send-email-dgilbert@redhat.com> From: "Denis V. Lunev" Message-ID: <57237794.5080801@openvz.org> Date: Fri, 29 Apr 2016 18:02:44 +0300 MIME-Version: 1.0 In-Reply-To: <1461941263-9523-3-git-send-email-dgilbert@redhat.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 2/5] 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)" , qemu-devel@nongnu.org, quintela@redhat.com, amit.shah@redhat.com Cc: aarcange@redhat.com, marcel.a@redhat.com, eblake@redhat.com On 04/29/2016 05:47 PM, 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 > --- > 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; > + } > +} > + > MigrationInfo *qmp_query_migrate(Error **errp) > { > MigrationInfo *info = g_malloc0(sizeof(*info)); > @@ -585,18 +604,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) > info->has_setup_time = true; > info->setup_time = s->setup_time; > > - info->has_ram = true; > - info->ram = g_malloc0(sizeof(*info->ram)); > - info->ram->transferred = ram_bytes_transferred(); > - info->ram->remaining = ram_bytes_remaining(); > - 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->dirty_pages_rate = s->dirty_pages_rate; > - info->ram->mbps = s->mbps; > - info->ram->dirty_sync_count = s->dirty_sync_count; > + populate_ram_info(info, s); > > if (blk_mig_active()) { > info->has_disk = true; > @@ -624,18 +632,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) > info->has_setup_time = true; > info->setup_time = s->setup_time; > > - info->has_ram = true; > - info->ram = g_malloc0(sizeof(*info->ram)); > - info->ram->transferred = ram_bytes_transferred(); > - info->ram->remaining = ram_bytes_remaining(); > - 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->dirty_pages_rate = s->dirty_pages_rate; > - info->ram->mbps = s->mbps; > - info->ram->dirty_sync_count = s->dirty_sync_count; > + populate_ram_info(info, s); > > if (blk_mig_active()) { > info->has_disk = true; > @@ -658,17 +655,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) > info->has_setup_time = true; > info->setup_time = s->setup_time; > > - info->has_ram = true; > - info->ram = g_malloc0(sizeof(*info->ram)); > - info->ram->transferred = ram_bytes_transferred(); > - info->ram->remaining = 0; > - 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; > + populate_ram_info(info, s); > break; > case MIGRATION_STATUS_FAILED: > info->has_status = true; Reviwed-by: Denis V. Lunev