From: Anthony PERARD <anthony.perard@citrix.com>
Date: Wed, 25 Jan 2012 12:36:06 +0000 (+0000)
Subject: xen: do not allocate RAM during INMIGRATE runstate
X-Git-Tag: v1.1-rc0~216^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c234572ded381423abca9801ebf5a32abd2495ef;p=thirdparty%2Fqemu.git

xen: do not allocate RAM during INMIGRATE runstate

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/xen-all.c b/xen-all.c
index 972cffd5ba7..10d53d168c6 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -190,6 +190,14 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr)
     xen_pfn_t *pfn_list;
     int i;
 
+    if (runstate_check(RUN_STATE_INMIGRATE)) {
+        /* RAM already populated in Xen */
+        fprintf(stderr, "%s: do not alloc "RAM_ADDR_FMT
+                " bytes of ram at "RAM_ADDR_FMT" when runstate is INMIGRATE\n",
+                __func__, size, ram_addr); 
+        return;
+    }
+
     if (mr == &ram_memory) {
         return;
     }