aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGonglei <arei.gonglei@huawei.com>2016-02-22 16:34:55 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2016-02-25 16:11:26 +0100
commit58eaa2174e99d9a05172d03fd2799ab8fd9e6f60 (patch)
treeed5148b0d4e23bb0ea74372a85ecc3ba6fb3262a
parent96c33a4523ee1abe382ce4ff3e82b90ba78aa186 (diff)
exec: store RAMBlock pointer into memory region
Each RAM memory region has a unique corresponding RAMBlock. In the current realization, the memory region only stored the ram_addr which means the offset of RAM address space, We need to qurey the global ram.list to find the ram block by ram_addr if we want to get the ram block, which is very expensive. Now, we store the RAMBlock pointer into memory region structure. So, if we know the mr, we can easily get the RAMBlock. Signed-off-by: Gonglei <arei.gonglei@huawei.com> Message-Id: <1456130097-4208-2-git-send-email-arei.gonglei@huawei.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--exec.c2
-rw-r--r--include/exec/memory.h2
-rw-r--r--memory.c1
3 files changed, 5 insertions, 0 deletions
diff --git a/exec.c b/exec.c
index 1f2450002b..4c0114a1a1 100644
--- a/exec.c
+++ b/exec.c
@@ -1717,6 +1717,8 @@ ram_addr_t qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
error_propagate(errp, local_err);
return -1;
}
+
+ mr->ram_block = new_block;
return addr;
}
diff --git a/include/exec/memory.h b/include/exec/memory.h
index c92734ae2b..683be46cd0 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -34,6 +34,7 @@
#include "qapi/error.h"
#include "qom/object.h"
#include "qemu/rcu.h"
+#include "qemu/typedefs.h"
#define MAX_PHYS_ADDR_SPACE_BITS 62
#define MAX_PHYS_ADDR (((hwaddr)1 << MAX_PHYS_ADDR_SPACE_BITS) - 1)
@@ -172,6 +173,7 @@ struct MemoryRegion {
bool global_locking;
uint8_t dirty_log_mask;
ram_addr_t ram_addr;
+ RAMBlock *ram_block;
Object *owner;
const MemoryRegionIOMMUOps *iommu_ops;
diff --git a/memory.c b/memory.c
index 09041edd43..b4451dd2a5 100644
--- a/memory.c
+++ b/memory.c
@@ -912,6 +912,7 @@ void memory_region_init(MemoryRegion *mr,
}
mr->name = g_strdup(name);
mr->owner = owner;
+ mr->ram_block = NULL;
if (name) {
char *escaped_name = memory_region_escape_name(name);