From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cw7B2-0006ID-IU for qemu-devel@nongnu.org; Thu, 06 Apr 2017 09:10:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cw7Ax-0008Qv-Kr for qemu-devel@nongnu.org; Thu, 06 Apr 2017 09:10:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50282) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cw7Ax-0008Q1-CM for qemu-devel@nongnu.org; Thu, 06 Apr 2017 09:10:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 734796330D for ; Thu, 6 Apr 2017 13:10:10 +0000 (UTC) From: Juan Quintela Date: Thu, 6 Apr 2017 15:08:53 +0200 Message-Id: <20170406130913.2232-35-quintela@redhat.com> In-Reply-To: <20170406130913.2232-1-quintela@redhat.com> References: <20170406130913.2232-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 34/54] ram: Create ram_dirty_sync_count() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dgilbert@redhat.com This is a ram field that was inside MigrationState. Move it to RAMState and make it the same that the other ram stats. Signed-off-by: Juan Quintela Reviewed-by: Peter Xu --- include/migration/migration.h | 2 +- migration/migration.c | 3 +-- migration/ram.c | 6 +++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 084d195..2f9c973 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -159,7 +159,6 @@ struct MigrationState bool enabled_capabilities[MIGRATION_CAPABILITY__MAX]; int64_t xbzrle_cache_size; int64_t setup_time; - int64_t dirty_sync_count; /* Count of requests incoming from destination */ int64_t postcopy_requests; @@ -255,6 +254,7 @@ void migrate_decompress_threads_join(void); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_transferred(void); uint64_t ram_bytes_total(void); +uint64_t ram_dirty_sync_count(void); void free_xbzrle_decoded_buf(void); void acct_update_position(QEMUFile *f, size_t size, bool zero); diff --git a/migration/migration.c b/migration/migration.c index 4e3eac5..b51918f 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -648,7 +648,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->ram->normal_bytes = norm_mig_pages_transferred() * (1ul << qemu_target_page_bits()); info->ram->mbps = s->mbps; - info->ram->dirty_sync_count = s->dirty_sync_count; + info->ram->dirty_sync_count = ram_dirty_sync_count(); info->ram->postcopy_requests = s->postcopy_requests; if (s->state != MIGRATION_STATUS_COMPLETED) { @@ -1112,7 +1112,6 @@ MigrationState *migrate_init(const MigrationParams *params) s->dirty_pages_rate = 0; s->dirty_bytes_rate = 0; s->setup_time = 0; - s->dirty_sync_count = 0; s->start_postcopy = false; s->postcopy_after_devices = false; s->postcopy_requests = 0; diff --git a/migration/ram.c b/migration/ram.c index be26d0c..1580617 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -271,6 +271,11 @@ uint64_t ram_bytes_remaining(void) return ram_state.migration_dirty_pages * TARGET_PAGE_SIZE; } +uint64_t ram_dirty_sync_count(void) +{ + return ram_state.bitmap_sync_count; +} + /* used by the search for pages to send */ struct PageSearchStatus { /* Current block being searched */ @@ -727,7 +732,6 @@ static void migration_bitmap_sync(RAMState *rs) rs->time_last_bitmap_sync = end_time; rs->num_dirty_pages_period = 0; } - s->dirty_sync_count = rs->bitmap_sync_count; if (migrate_use_events()) { qapi_event_send_migration_pass(rs->bitmap_sync_count, NULL); } -- 2.9.3