sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

memory: drop AddressSpaceOps 

All functionality has been moved to various MemoryListeners.

Signed-off-by: Avi Kivity <avi@redhat.com>
Reviewed-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
Avi Kivity 2012-02-08 17:19:46 +02:00
parent 9363274709
commit 8df8a8436f
1 changed files with 2 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
memory.c
View File

@ -191,20 +191,12 @@ typedef struct AddressSpaceOps AddressSpaceOps;
/* A system address space - I/O, memory, etc. */ /* A system address space - I/O, memory, etc. */
struct AddressSpace { struct AddressSpace {
const AddressSpaceOps *ops;
MemoryRegion *root; MemoryRegion *root;
FlatView current_map; FlatView current_map;
int ioeventfd_nb; int ioeventfd_nb;
MemoryRegionIoeventfd *ioeventfds; MemoryRegionIoeventfd *ioeventfds;
}; };
struct AddressSpaceOps {
void (*range_add)(AddressSpace *as, FlatRange *fr);
void (*range_del)(AddressSpace *as, FlatRange *fr);
void (*log_start)(AddressSpace *as, FlatRange *fr);
void (*log_stop)(AddressSpace *as, FlatRange *fr);
};
#define FOR_EACH_FLAT_RANGE(var, view) \ #define FOR_EACH_FLAT_RANGE(var, view) \
for (var = (view)->ranges; var < (view)->ranges + (view)->nr; ++var) for (var = (view)->ranges; var < (view)->ranges + (view)->nr; ++var)
@ -336,32 +328,7 @@ static void access_with_adjusted_size(target_phys_addr_t addr,
} }
} }
static void as_memory_range_add(AddressSpace *as, FlatRange *fr) static AddressSpace address_space_memory;
{
}
static void as_memory_range_del(AddressSpace *as, FlatRange *fr)
{
}
static void as_memory_log_start(AddressSpace *as, FlatRange *fr)
{
}
static void as_memory_log_stop(AddressSpace *as, FlatRange *fr)
{
}
static const AddressSpaceOps address_space_ops_memory = {
.range_add = as_memory_range_add,
.range_del = as_memory_range_del,
.log_start = as_memory_log_start,
.log_stop = as_memory_log_stop,
};
static AddressSpace address_space_memory = {
.ops = &address_space_ops_memory,
};
static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t offset, static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t offset,
unsigned width, bool write) unsigned width, bool write)
@ -437,22 +404,7 @@ const IORangeOps memory_region_iorange_ops = {
.write = memory_region_iorange_write, .write = memory_region_iorange_write,
}; };
static void as_io_range_add(AddressSpace *as, FlatRange *fr) static AddressSpace address_space_io;
{
}
static void as_io_range_del(AddressSpace *as, FlatRange *fr)
{
}
static const AddressSpaceOps address_space_ops_io = {
.range_add = as_io_range_add,
.range_del = as_io_range_del,
};
static AddressSpace address_space_io = {
.ops = &address_space_ops_io,
};
static AddressSpace *memory_region_to_address_space(MemoryRegion *mr) static AddressSpace *memory_region_to_address_space(MemoryRegion *mr)
{ {
@ -685,7 +637,6 @@ static void address_space_update_topology_pass(AddressSpace *as,
if (!adding) { if (!adding) {
MEMORY_LISTENER_UPDATE_REGION(frold, as, Reverse, region_del); MEMORY_LISTENER_UPDATE_REGION(frold, as, Reverse, region_del);
as->ops->range_del(as, frold);
} }
++iold; ++iold;
@ -695,9 +646,7 @@ static void address_space_update_topology_pass(AddressSpace *as,
if (adding) { if (adding) {
if (frold->dirty_log_mask && !frnew->dirty_log_mask) { if (frold->dirty_log_mask && !frnew->dirty_log_mask) {
MEMORY_LISTENER_UPDATE_REGION(frnew, as, Reverse, log_stop); MEMORY_LISTENER_UPDATE_REGION(frnew, as, Reverse, log_stop);
as->ops->log_stop(as, frnew);
} else if (frnew->dirty_log_mask && !frold->dirty_log_mask) { } else if (frnew->dirty_log_mask && !frold->dirty_log_mask) {
as->ops->log_start(as, frnew);
MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, log_start); MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, log_start);
} }
} }
@ -708,7 +657,6 @@ static void address_space_update_topology_pass(AddressSpace *as,
/* In new */ /* In new */
if (adding) { if (adding) {
as->ops->range_add(as, frnew);
MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_add); MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_add);
} }