[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/10] memory: drop AddressSpaceOps
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 10/10] memory: drop AddressSpaceOps |
Date: |
Wed, 8 Feb 2012 17:27:59 +0200 |
All functionality has been moved to various MemoryListeners.
Signed-off-by: Avi Kivity <address@hidden>
---
memory.c | 56 ++------------------------------------------------------
1 files changed, 2 insertions(+), 54 deletions(-)
diff --git a/memory.c b/memory.c
index 4e7a90b..4f854d4 100644
--- a/memory.c
+++ b/memory.c
@@ -191,20 +191,12 @@ struct FlatView {
/* A system address space - I/O, memory, etc. */
struct AddressSpace {
- const AddressSpaceOps *ops;
MemoryRegion *root;
FlatView current_map;
int ioeventfd_nb;
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) \
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 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 AddressSpace address_space_memory;
static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t offset,
unsigned width, bool write)
@@ -437,22 +404,7 @@ static void memory_region_iorange_write(IORange *iorange,
.write = memory_region_iorange_write,
};
-static void as_io_range_add(AddressSpace *as, FlatRange *fr)
-{
-}
-
-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 address_space_io;
static AddressSpace *memory_region_to_address_space(MemoryRegion *mr)
{
@@ -685,7 +637,6 @@ static void address_space_update_topology_pass(AddressSpace
*as,
if (!adding) {
MEMORY_LISTENER_UPDATE_REGION(frold, as, Reverse, region_del);
- as->ops->range_del(as, frold);
}
++iold;
@@ -695,9 +646,7 @@ static void address_space_update_topology_pass(AddressSpace
*as,
if (adding) {
if (frold->dirty_log_mask && !frnew->dirty_log_mask) {
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) {
- as->ops->log_start(as, frnew);
MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward,
log_start);
}
}
@@ -708,7 +657,6 @@ static void address_space_update_topology_pass(AddressSpace
*as,
/* In new */
if (adding) {
- as->ops->range_add(as, frnew);
MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_add);
}
--
1.7.9
- [Qemu-devel] [PATCH 00/10] Remove AddressSpaceOps, Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 06/10] memory: move ioeventfd ops to MemoryListener, Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 05/10] memory: code motion: move MEMORY_LISTENER_CALL(), Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 04/10] memory: switch memory listeners to a QTAILQ, Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 02/10] memory: remove memory_region_set_offset(), Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 03/10] memory: add shorthand for invoking a callback on all listeners, Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 08/10] memory: don't pass ->readable attribute to cpu_register_physical_memory_log, Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 07/10] memory: add a readonly attribute to MemoryRegionSection, Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 01/10] ioport: change portio_list not to use memory_region_set_offset(), Avi Kivity, 2012/02/08
- [Qemu-devel] [PATCH 10/10] memory: drop AddressSpaceOps,
Avi Kivity <=
- [Qemu-devel] [PATCH 09/10] memory: use a MemoryListener for core memory map updates too, Avi Kivity, 2012/02/08
- Re: [Qemu-devel] [PATCH 00/10] Remove AddressSpaceOps, Avi Kivity, 2012/02/08
- Re: [Qemu-devel] [PATCH 00/10] Remove AddressSpaceOps, Richard Henderson, 2012/02/08