openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

exec: dummy_section: Pass address space through. 

Rather than use the global singleton.

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Crosthwaite 2014-06-02 19:08:44 -07:00 committed by Paolo Bonzini
parent 3fb5bf5730
commit a656e22f09
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
exec.c
View File

@ -1776,10 +1776,12 @@ static subpage_t *subpage_init(AddressSpace *as, hwaddr base)
return mmio; return mmio;
} }
static uint16_t dummy_section(PhysPageMap *map, MemoryRegion *mr) static uint16_t dummy_section(PhysPageMap *map, AddressSpace *as,
MemoryRegion *mr)
{ {
assert(as);
MemoryRegionSection section = { MemoryRegionSection section = {
.address_space = &address_space_memory, .address_space = as,
.mr = mr, .mr = mr,
.offset_within_address_space = 0, .offset_within_address_space = 0,
.offset_within_region = 0, .offset_within_region = 0,
@ -1811,13 +1813,13 @@ static void mem_begin(MemoryListener *listener)
AddressSpaceDispatch *d = g_new0(AddressSpaceDispatch, 1); AddressSpaceDispatch *d = g_new0(AddressSpaceDispatch, 1);
uint16_t n; uint16_t n;
n = dummy_section(&d->map, &io_mem_unassigned); n = dummy_section(&d->map, as, &io_mem_unassigned);
assert(n == PHYS_SECTION_UNASSIGNED); assert(n == PHYS_SECTION_UNASSIGNED);
n = dummy_section(&d->map, &io_mem_notdirty); n = dummy_section(&d->map, as, &io_mem_notdirty);
assert(n == PHYS_SECTION_NOTDIRTY); assert(n == PHYS_SECTION_NOTDIRTY);
n = dummy_section(&d->map, &io_mem_rom); n = dummy_section(&d->map, as, &io_mem_rom);
assert(n == PHYS_SECTION_ROM); assert(n == PHYS_SECTION_ROM);
n = dummy_section(&d->map, &io_mem_watch); n = dummy_section(&d->map, as, &io_mem_watch);
assert(n == PHYS_SECTION_WATCH); assert(n == PHYS_SECTION_WATCH);
d->phys_map = (PhysPageEntry) { .ptr = PHYS_MAP_NODE_NIL, .skip = 1 }; d->phys_map = (PhysPageEntry) { .ptr = PHYS_MAP_NODE_NIL, .skip = 1 };