ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory: move address_space_memory and address_space_io out of memory core 

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 <aliguori@us.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2012-10-02 18:49:28 +02:00
parent 95d2994a2f
commit 2673a5da25
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
exec-memory.h
View File

@ -33,12 +33,6 @@ MemoryRegion *get_system_memory(void);
*/ */
MemoryRegion *get_system_io(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
#endif #endif

9
exec.c
View File

@ -116,6 +116,9 @@ RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list.blocks) };
static MemoryRegion *system_memory; static MemoryRegion *system_memory;
static MemoryRegion *system_io; 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; MemoryRegion io_mem_ram, io_mem_rom, io_mem_unassigned, io_mem_notdirty;
static MemoryRegion io_mem_subpage_ram; static MemoryRegion io_mem_subpage_ram;
@ -3235,11 +3238,13 @@ static void memory_map_init(void)
{ {
system_memory = g_malloc(sizeof(*system_memory)); system_memory = g_malloc(sizeof(*system_memory));
memory_region_init(system_memory, "system", INT64_MAX); 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)); system_io = g_malloc(sizeof(*system_io));
memory_region_init(system_io, "io", 65536); 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(&core_memory_listener, system_memory);
memory_listener_register(&io_memory_listener, system_io); memory_listener_register(&io_memory_listener, system_io);

16
memory.c
View File

@ -364,8 +364,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, static const MemoryRegionPortio *find_portio(MemoryRegion *mr, uint64_t offset,
unsigned width, bool write) unsigned width, bool write)
{ {
@ -454,8 +452,6 @@ const IORangeOps memory_region_iorange_ops = {
.destructor = memory_region_iorange_destructor, .destructor = memory_region_iorange_destructor,
}; };
static AddressSpace address_space_io;
static AddressSpace *memory_region_to_address_space(MemoryRegion *mr) static AddressSpace *memory_region_to_address_space(MemoryRegion *mr)
{ {
AddressSpace *as; AddressSpace *as;
@ -1545,18 +1541,6 @@ void address_space_init(AddressSpace *as, MemoryRegion *root)
memory_region_transaction_commit(); 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) uint64_t io_mem_read(MemoryRegion *mr, target_phys_addr_t addr, unsigned size)
{ {
return memory_region_dispatch_read(mr, addr, size); return memory_region_dispatch_read(mr, addr, size);