aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2011-12-21 13:09:49 +0200
committerAvi Kivity <avi@redhat.com>2012-01-04 13:34:48 +0200
commit7c63736603640ca7b74b65d71afc54fd0a3492f9 (patch)
treedd3f64ddeceb262b2abf0ffa426dfbba35c492b8
parentc5705a7728b4a6bc9e4f2d35911adbaf28042b25 (diff)
Store MemoryRegion in RAMBlock
As a step in moving live migration from RAMBlocks to MemoryRegions, store the MemoryRegion in a RAMBlock. Reviewed-by: Anthony Liguori <aliguori@us.ibm.com> Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--cpu-all.h1
-rw-r--r--exec.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/cpu-all.h b/cpu-all.h
index 734833abda..4acaa8bc41 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -476,6 +476,7 @@ extern ram_addr_t ram_size;
#define RAM_PREALLOC_MASK (1 << 0)
typedef struct RAMBlock {
+ struct MemoryRegion *mr;
uint8_t *host;
ram_addr_t offset;
ram_addr_t length;
diff --git a/exec.c b/exec.c
index dffceb970c..a4116d91cf 100644
--- a/exec.c
+++ b/exec.c
@@ -2793,6 +2793,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
size = TARGET_PAGE_ALIGN(size);
new_block = g_malloc0(sizeof(*new_block));
+ new_block->mr = mr;
new_block->offset = find_ram_offset(size);
if (host) {
new_block->host = host;