From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1co9KM-0007V0-EM for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1co9KL-0003hS-Ig for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53204) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1co9KL-0003g9-9O for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:57 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 43748635C5 for ; Wed, 15 Mar 2017 13:50:57 +0000 (UTC) From: Juan Quintela Date: Wed, 15 Mar 2017 14:50:11 +0100 Message-Id: <20170315135021.6978-22-quintela@redhat.com> In-Reply-To: <20170315135021.6978-1-quintela@redhat.com> References: <20170315135021.6978-1-quintela@redhat.com> Subject: [Qemu-devel] [PATCH 21/31] ram: Everything was init to zero, so use memset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com And then init only things that are not zero by default. Signed-off-by: Juan Quintela --- migration/ram.c | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 606e836..7f56b5f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -588,15 +588,6 @@ static void migration_bitmap_sync_range(RAMState *rs, ram_addr_t start, cpu_physical_memory_sync_dirty_bitmap(bitmap, start, length); } -static void migration_bitmap_sync_init(RAMState *rs) -{ - rs->start_time = 0; - rs->bytes_xfer_prev = 0; - rs->num_dirty_pages_period = 0; - rs->xbzrle_cache_miss_prev = 0; - rs->iterations_prev = 0; -} - /* Returns a summary bitmap of the page sizes of all RAMBlocks; * for VMs with just normal pages this is equivalent to the * host page size. If it's got some huge pages then it's the OR @@ -1915,21 +1906,11 @@ err: return ret; } -static int ram_save_init_globals(RAMState *rs) +static int ram_state_init(RAMState *rs) { int64_t ram_bitmap_pages; /* Size of bitmap in pages, including gaps */ - rs->dirty_rate_high_cnt = 0; - rs->bitmap_sync_count = 0; - rs->zero_pages = 0; - rs->norm_pages = 0; - rs->iterations = 0; - rs->xbzrle_bytes = 0; - rs->xbzrle_pages = 0; - rs->xbzrle_cache_miss = 0; - rs->xbzrle_cache_miss_rate = 0; - rs->xbzrle_overflows = 0; - migration_bitmap_sync_init(rs); + memset(rs, 0, sizeof(*rs)); qemu_mutex_init(&migration_bitmap_mutex); if (migrate_use_xbzrle()) { @@ -2010,7 +1991,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) /* migration has already setup the bitmap, reuse it. */ if (!migration_in_colo_state()) { - if (ram_save_init_globals(rs) < 0) { + if (ram_state_init(rs) < 0) { return -1; } } -- 2.9.3