[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/23] memory: rename MemoryRegion::has_ram_addr
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 07/23] memory: rename MemoryRegion::has_ram_addr to ::terminates |
Date: |
Tue, 26 Jul 2011 14:26:06 +0300 |
I/O regions will not have ram_addrs, so this is a better name.
Reviewed-by: Anthony Liguori <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
memory.c | 18 +++++++++---------
memory.h | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/memory.c b/memory.c
index bae7765..9e1a838 100644
--- a/memory.c
+++ b/memory.c
@@ -251,7 +251,7 @@ static void render_memory_region(FlatView *view,
render_memory_region(view, subregion, base, clip);
}
- if (!mr->has_ram_addr) {
+ if (!mr->terminates) {
return;
}
@@ -373,7 +373,7 @@ void memory_region_init(MemoryRegion *mr,
mr->size = size;
mr->addr = 0;
mr->offset = 0;
- mr->has_ram_addr = false;
+ mr->terminates = false;
mr->priority = 0;
mr->may_overlap = false;
mr->alias = NULL;
@@ -528,7 +528,7 @@ void memory_region_init_io(MemoryRegion *mr,
memory_region_init(mr, name, size);
mr->ops = ops;
mr->opaque = opaque;
- mr->has_ram_addr = true;
+ mr->terminates = true;
mr->ram_addr = cpu_register_io_memory(memory_region_read_thunk,
memory_region_write_thunk,
mr,
@@ -541,7 +541,7 @@ void memory_region_init_ram(MemoryRegion *mr,
uint64_t size)
{
memory_region_init(mr, name, size);
- mr->has_ram_addr = true;
+ mr->terminates = true;
mr->ram_addr = qemu_ram_alloc(dev, name, size);
}
@@ -552,7 +552,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
void *ptr)
{
memory_region_init(mr, name, size);
- mr->has_ram_addr = true;
+ mr->terminates = true;
mr->ram_addr = qemu_ram_alloc_from_ptr(dev, name, size, ptr);
}
@@ -595,13 +595,13 @@ void memory_region_set_log(MemoryRegion *mr, bool log,
unsigned client)
bool memory_region_get_dirty(MemoryRegion *mr, target_phys_addr_t addr,
unsigned client)
{
- assert(mr->has_ram_addr);
+ assert(mr->terminates);
return cpu_physical_memory_get_dirty(mr->ram_addr + addr, 1 << client);
}
void memory_region_set_dirty(MemoryRegion *mr, target_phys_addr_t addr)
{
- assert(mr->has_ram_addr);
+ assert(mr->terminates);
return cpu_physical_memory_set_dirty(mr->ram_addr + addr);
}
@@ -625,7 +625,7 @@ void memory_region_set_readonly(MemoryRegion *mr, bool
readonly)
void memory_region_reset_dirty(MemoryRegion *mr, target_phys_addr_t addr,
target_phys_addr_t size, unsigned client)
{
- assert(mr->has_ram_addr);
+ assert(mr->terminates);
cpu_physical_memory_reset_dirty(mr->ram_addr + addr,
mr->ram_addr + addr + size,
1 << client);
@@ -637,7 +637,7 @@ void *memory_region_get_ram_ptr(MemoryRegion *mr)
return memory_region_get_ram_ptr(mr->alias) + mr->alias_offset;
}
- assert(mr->has_ram_addr);
+ assert(mr->terminates);
return qemu_get_ram_ptr(mr->ram_addr);
}
diff --git a/memory.h b/memory.h
index d441bd8..47d6b9d 100644
--- a/memory.h
+++ b/memory.h
@@ -90,7 +90,7 @@ struct MemoryRegion {
target_phys_addr_t addr;
target_phys_addr_t offset;
ram_addr_t ram_addr;
- bool has_ram_addr;
+ bool terminates;
MemoryRegion *alias;
target_phys_addr_t alias_offset;
unsigned priority;
--
1.7.5.3
- [Qemu-devel] [PATCH v2 08/23] memory: late initialization of ram_addr, (continued)
- [Qemu-devel] [PATCH v2 08/23] memory: late initialization of ram_addr, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 11/23] memory: add backward compatibility for old mmio registration, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 13/23] memory: separate building the final memory map into two steps, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 06/23] memory: abstract address space operations, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 14/23] memory: transaction API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 09/23] memory: I/O address space support, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 15/23] exec.c: initialize memory map, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 05/23] Internal interfaces for memory API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 19/23] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 02/23] Hierarchical memory region API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 07/23] memory: rename MemoryRegion::has_ram_addr to ::terminates,
Avi Kivity <=
- [Qemu-devel] [PATCH v2 22/23] sysbus: add MemoryRegion based memory management API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 18/23] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 23/23] usb-ohci: convert to MemoryRegion, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 20/23] pci: pass address space to pci bus when created, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 16/23] ioport: register ranges by byte aligned addresses always, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 21/23] pci: add MemoryRegion based BAR management API, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 12/23] memory: add ioeventfd support, Avi Kivity, 2011/07/26
- [Qemu-devel] [PATCH v2 01/23] Add memory API documentation, Avi Kivity, 2011/07/26
- Re: [Qemu-devel] [PATCH v2 00/23] Memory API, batch 1, Anthony Liguori, 2011/07/29