From patchwork Fri Aug 10 16:43:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mitsyanko Igor X-Patchwork-Id: 176537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4866B2C0089 for ; Sat, 11 Aug 2012 02:44:19 +1000 (EST) Received: from localhost ([::1]:39122 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzsJt-0001pv-B5 for incoming@patchwork.ozlabs.org; Fri, 10 Aug 2012 12:44:17 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzsJE-0008Va-QP for qemu-devel@nongnu.org; Fri, 10 Aug 2012 12:43:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SzsJC-0006I6-MU for qemu-devel@nongnu.org; Fri, 10 Aug 2012 12:43:36 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:10674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzsJC-0006Gh-G5 for qemu-devel@nongnu.org; Fri, 10 Aug 2012 12:43:34 -0400 Received: from eusync2.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M8J00AEIT5M4R10@mailout4.w1.samsung.com> for qemu-devel@nongnu.org; Fri, 10 Aug 2012 17:44:10 +0100 (BST) Received: from idodo.rnd.samsung.ru ([106.109.9.232]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0M8J00DPPT46YC10@eusync2.samsung.com> for qemu-devel@nongnu.org; Fri, 10 Aug 2012 17:43:32 +0100 (BST) From: Igor Mitsyanko To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2012 20:43:17 +0400 Message-id: <1344616998-9141-3-git-send-email-i.mitsyanko@samsung.com> X-Mailer: git-send-email 1.7.5.4 In-reply-to: <1344616998-9141-1-git-send-email-i.mitsyanko@samsung.com> References: <1344616998-9141-1-git-send-email-i.mitsyanko@samsung.com> X-TM-AS-MML: No X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 210.118.77.14 Cc: peter.maydell@linaro.org, kyungmin.park@samsung.com, Igor Mitsyanko , e.voevodin@samsung.com Subject: [Qemu-devel] [PATCH 2/3] exynos4210.c: register chipid_mem and rom_mem with vmstate X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Even if we do not register newly created RAM MemoryRegion for migration with vmstate_register_ram_global() function, ram_save_live() still saves this region to snapshot file with empty idstr=="". Consequently this results in error during VM restoration in ram_load(). Register chipid_mem and rom_mem for migration to avoid this problem. Signed-off-by: Igor Mitsyanko --- hw/exynos4210.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/hw/exynos4210.c b/hw/exynos4210.c index a3a06f7..94d2e41 100644 --- a/hw/exynos4210.c +++ b/hw/exynos4210.c @@ -201,6 +201,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, memory_region_init_ram_ptr(&s->chipid_mem, "exynos4210.chipid", sizeof(chipid_and_omr), chipid_and_omr); memory_region_set_readonly(&s->chipid_mem, true); + vmstate_register_ram_global(&s->chipid_mem); memory_region_add_subregion(system_mem, EXYNOS4210_CHIPID_ADDR, &s->chipid_mem); @@ -208,6 +209,7 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem, memory_region_init_ram(&s->irom_mem, "exynos4210.irom", EXYNOS4210_IROM_SIZE); memory_region_set_readonly(&s->irom_mem, true); + vmstate_register_ram_global(&s->irom_mem); memory_region_add_subregion(system_mem, EXYNOS4210_IROM_BASE_ADDR, &s->irom_mem); /* mirror of iROM */