[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 07/58] memory: late initialization of ram_addr
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [RFC v4 07/58] memory: late initialization of ram_addr |
Date: |
Sun, 17 Jul 2011 14:13:34 +0300 |
For non-RAM memory regions, we cannot tell whether this is an I/O region
or an MMIO region. Since the qemu backing registration is different for
the two, we have to defer initialization until we know which address
space we are in.
These shenanigans will be removed once the backing registration is unified
with the memory API.
Signed-off-by: Avi Kivity <address@hidden>
---
memory.c | 24 ++++++++++++++++++++----
memory.h | 1 +
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/memory.c b/memory.c
index 5fda4a0..bc8bfa2 100644
--- a/memory.c
+++ b/memory.c
@@ -158,10 +158,14 @@ static void flatview_simplify(FlatView *view)
}
}
+static void memory_region_prepare_ram_addr(MemoryRegion *mr);
+
static void as_memory_range_add(AddressSpace *as, FlatRange *fr)
{
ram_addr_t phys_offset, region_offset;
+ memory_region_prepare_ram_addr(fr->mr);
+
phys_offset = fr->mr->ram_addr;
region_offset = fr->offset_in_region;
/* cpu_register_physical_memory_log() wants region_offset for
@@ -512,6 +516,19 @@ static CPUWriteMemoryFunc * const
memory_region_write_thunk[] = {
memory_region_write_thunk_l,
};
+static void memory_region_prepare_ram_addr(MemoryRegion *mr)
+{
+ if (mr->backend_registered) {
+ return;
+ }
+
+ mr->ram_addr = cpu_register_io_memory(memory_region_read_thunk,
+ memory_region_write_thunk,
+ mr,
+ mr->ops->endianness);
+ mr->backend_registered = true;
+}
+
void memory_region_init_io(MemoryRegion *mr,
const MemoryRegionOps *ops,
void *opaque,
@@ -522,10 +539,7 @@ void memory_region_init_io(MemoryRegion *mr,
mr->ops = ops;
mr->opaque = opaque;
mr->terminates = true;
- mr->ram_addr = cpu_register_io_memory(memory_region_read_thunk,
- memory_region_write_thunk,
- mr,
- mr->ops->endianness);
+ mr->backend_registered = false;
}
void memory_region_init_ram(MemoryRegion *mr,
@@ -536,6 +550,7 @@ void memory_region_init_ram(MemoryRegion *mr,
memory_region_init(mr, name, size);
mr->terminates = true;
mr->ram_addr = qemu_ram_alloc(dev, name, size);
+ mr->backend_registered = true;
}
void memory_region_init_ram_ptr(MemoryRegion *mr,
@@ -547,6 +562,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
memory_region_init(mr, name, size);
mr->terminates = true;
mr->ram_addr = qemu_ram_alloc_from_ptr(dev, name, size, ptr);
+ mr->backend_registered = true;
}
void memory_region_init_alias(MemoryRegion *mr,
diff --git a/memory.h b/memory.h
index 2ad7202..0994b18 100644
--- a/memory.h
+++ b/memory.h
@@ -76,6 +76,7 @@ struct MemoryRegion {
uint64_t size;
target_phys_addr_t addr;
target_phys_addr_t offset;
+ bool backend_registered;
ram_addr_t ram_addr;
bool terminates;
MemoryRegion *alias;
--
1.7.5.3
- [Qemu-devel] [RFC v4 00/58] Memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 04/58] Internal interfaces for memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 13/58] ioport: register ranges by byte aligned addresses always, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 25/58] cirrus: simplify bitblt BAR access functions, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 02/58] memory: implement dirty tracking, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 30/58] exec.c: fix initialization of system I/O memory region, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 03/58] memory: merge adjacent segments of a single memory region, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 07/58] memory: late initialization of ram_addr,
Avi Kivity <=
- [Qemu-devel] [RFC v4 37/58] es1370: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 35/58] e1000: convert to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 05/58] memory: abstract address space operations, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 18/58] pci: add MemoryRegion based BAR management API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 15/58] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 12/58] exec.c: initialize memory map, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 11/58] memory: add ioeventfd support, Avi Kivity, 2011/07/17
- [Qemu-devel] [RFC v4 33/58] rtl8139: convert to memory API, Avi Kivity, 2011/07/17