From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53636) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTbr4-0006fp-VQ for qemu-devel@nongnu.org; Thu, 24 Nov 2011 11:08:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTbqz-0001zG-8D for qemu-devel@nongnu.org; Thu, 24 Nov 2011 11:08:54 -0500 Received: from smtp.citrix.com ([66.165.176.89]:51541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTbqy-0001y5-T7 for qemu-devel@nongnu.org; Thu, 24 Nov 2011 11:08:49 -0500 From: Anthony PERARD Date: Thu, 24 Nov 2011 16:08:12 +0000 Message-ID: <1322150893-887-5-git-send-email-anthony.perard@citrix.com> In-Reply-To: <1322150893-887-1-git-send-email-anthony.perard@citrix.com> References: <1322150893-887-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 4/5] xen: Change memory access behavior during migration. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Cc: Anthony PERARD , Xen Devel , Stefano Stabellini Do not allocate RAM during pre-migration runstate. Do not actually "do" set_memory during migration. Signed-off-by: Anthony PERARD --- xen-all.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen-all.c b/xen-all.c index 40e8869..279651a 100644 --- a/xen-all.c +++ b/xen-all.c @@ -191,6 +191,11 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size) trace_xen_ram_alloc(ram_addr, size); + if (runstate_check(RUN_STATE_PREMIGRATE)) { + /* RAM already populated in Xen */ + return; + } + nr_pfn = size >> TARGET_PAGE_BITS; pfn_list = g_malloc(sizeof (*pfn_list) * nr_pfn); @@ -271,6 +276,13 @@ go_physmap: DPRINTF("mapping vram to %llx - %llx, from %llx\n", start_addr, start_addr + size, phys_offset); + if (runstate_check(RUN_STATE_INMIGRATE)) { + /* The mapping should already be done and can not be done a second + * time. So we just add to the physmap list instead. + */ + goto done; + } + pfn = phys_offset >> TARGET_PAGE_BITS; start_gpfn = start_addr >> TARGET_PAGE_BITS; for (i = 0; i < size >> TARGET_PAGE_BITS; i++) { @@ -285,6 +297,7 @@ go_physmap: } } +done: physmap = g_malloc(sizeof (XenPhysmap)); physmap->start_addr = start_addr; -- Anthony PERARD