[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 15/23] memory: move address_space_memory and addr
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v1 15/23] memory: move address_space_memory and address_space_io out of memory core |
Date: |
Sun, 7 Oct 2012 14:38:20 +0200 |
With this change, memory.c no longer knows anything about special address
spaces, so it is prepared for AddressSpace based DMA.
Reviewed-by: Anthony Liguori <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
exec-memory.h | 6 ------
exec.c | 9 +++++++--
memory.c | 16 ----------------
3 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/exec-memory.h b/exec-memory.h
index 1cd92ee..6707e40 100644
--- a/exec-memory.h
+++ b/exec-memory.h
@@ -33,12 +33,6 @@ MemoryRegion *get_system_memory(void);
*/
MemoryRegion *get_system_io(void);
-/* Set the root memory region. This region is the system memory map. */
-void set_system_memory_map(MemoryRegion *mr);
-
-/* Set the I/O memory region. This region is the I/O memory map. */
-void set_system_io_map(MemoryRegion *mr);
-
#endif
#endif
diff --git a/exec.c b/exec.c
index 51a32e7..e5f26fb 100644
--- a/exec.c
+++ b/exec.c
@@ -116,6 +116,9 @@
static MemoryRegion *system_memory;
static MemoryRegion *system_io;
+static AddressSpace address_space_io;
+static AddressSpace address_space_memory;
+
MemoryRegion io_mem_ram, io_mem_rom, io_mem_unassigned, io_mem_notdirty;
static MemoryRegion io_mem_subpage_ram;
@@ -3245,11 +3248,13 @@ static void memory_map_init(void)
{
system_memory = g_malloc(sizeof(*system_memory));
memory_region_init(system_memory, "system", INT64_MAX);
- set_system_memory_map(system_memory);
+ address_space_init(&address_space_memory, system_memory);
+ address_space_memory.name = "memory";
system_io = g_malloc(sizeof(*system_io));
memory_region_init(system_io, "io", 65536);
- set_system_io_map(system_io);
+ address_space_init(&address_space_io, system_io);
+ address_space_io.name = "I/O";
memory_listener_register(&core_memory_listener, system_memory);
memory_listener_register(&io_memory_listener, system_io);
diff --git a/memory.c b/memory.c
index eb75349..7bc5a32 100644
--- a/memory.c
+++ b/memory.c
@@ -358,8 +358,6 @@ static void access_with_adjusted_size(target_phys_addr_t
addr,
}
}
-static AddressSpace address_space_memory;
-
static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t offset,
unsigned width, bool write)
{
@@ -448,8 +446,6 @@ static void memory_region_iorange_destructor(IORange
*iorange)
.destructor = memory_region_iorange_destructor,
};
-static AddressSpace address_space_io;
-
static AddressSpace *memory_region_to_address_space(MemoryRegion *mr)
{
AddressSpace *as;
@@ -1556,18 +1552,6 @@ void address_space_init(AddressSpace *as, MemoryRegion
*root)
memory_region_transaction_commit();
}
-void set_system_memory_map(MemoryRegion *mr)
-{
- address_space_init(&address_space_memory, mr);
- address_space_memory.name = "memory";
-}
-
-void set_system_io_map(MemoryRegion *mr)
-{
- address_space_init(&address_space_io, mr);
- address_space_io.name = "I/O";
-}
-
uint64_t io_mem_read(MemoryRegion *mr, target_phys_addr_t addr, unsigned size)
{
return memory_region_dispatch_read(mr, addr, size);
--
1.7.12
- [Qemu-devel] [PATCH v1 01/23] memory: rename 'exec-obsolete.h', (continued)
- [Qemu-devel] [PATCH v1 01/23] memory: rename 'exec-obsolete.h', Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 02/23] vhost: use MemoryListener filtering to only monitor RAM address space, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 03/23] kvm: use separate MemoryListeners for memory and I/O, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 04/23] xen_pt: use separate MemoryListeners for memory and I/O, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 05/23] memory: prepare AddressSpace for exporting, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 06/23] memory: export AddressSpace, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 07/23] memory: maintain a list of address spaces, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 08/23] memory: provide defaults for MemoryListener operations, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 10/23] vfio: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 09/23] memory: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 15/23] memory: move address_space_memory and address_space_io out of memory core,
Avi Kivity <=
- [Qemu-devel] [PATCH v1 14/23] memory: manage coalesced mmio via a MemoryListener, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 11/23] xen_pt: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 12/23] kvm: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 13/23] xen: use new MEMORY_LISTENER_DEFAULT_OPS, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 20/23] dma: make dma access its own address space, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 19/23] memory: per-AddressSpace dispatch, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 21/23] memory: add address_space_destroy(), Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 22/23] pci: give each device its own address space, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 16/23] memory: move tcg flush into a tcg memory listener, Avi Kivity, 2012/10/07
- [Qemu-devel] [PATCH v1 23/23] pci: honor PCI_COMMAND_MASTER, Avi Kivity, 2012/10/07