[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/11] exec: dummy_section: Pass address space throug
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/11] exec: dummy_section: Pass address space through. |
Date: |
Wed, 18 Jun 2014 15:42:03 +0200 |
From: Peter Crosthwaite <address@hidden>
Rather than use the global singleton.
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/exec.c b/exec.c
index 6ce989a..c3fbbb3 100644
--- a/exec.c
+++ b/exec.c
@@ -1776,10 +1776,12 @@ static subpage_t *subpage_init(AddressSpace *as, hwaddr
base)
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 = {
- .address_space = &address_space_memory,
+ .address_space = as,
.mr = mr,
.offset_within_address_space = 0,
.offset_within_region = 0,
@@ -1811,13 +1813,13 @@ static void mem_begin(MemoryListener *listener)
AddressSpaceDispatch *d = g_new0(AddressSpaceDispatch, 1);
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);
- n = dummy_section(&d->map, &io_mem_notdirty);
+ n = dummy_section(&d->map, as, &io_mem_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);
- n = dummy_section(&d->map, &io_mem_watch);
+ n = dummy_section(&d->map, as, &io_mem_watch);
assert(n == PHYS_SECTION_WATCH);
d->phys_map = (PhysPageEntry) { .ptr = PHYS_MAP_NODE_NIL, .skip = 1 };
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] Memory API changes for 2014-06-18, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 01/11] MAINTAINERS: Add myself as Memory API maintainer, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 02/11] exec: introduce qemu_ram_unset_idstr() to unset RAMBlock idstr, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 05/11] memory: Simplify mr_add_subregion() if-else, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 06/11] exec: dummy_section: Pass address space through.,
Paolo Bonzini <=
- [Qemu-devel] [PULL 09/11] memory: MemoryRegion: factor out memory region re-adder, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 08/11] memory: MemoryRegion: factor out subregion add functionality, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 07/11] qtest: fix qtest_clock_warp() for no deadline case, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 10/11] memory: MemoryRegion: rename parent to container, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 11/11] memory: Don't call memory_region_update_coalesced_range if nothing changed, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 03/11] unset RAMBlock idstr when unregister MemoryRegion, Paolo Bonzini, 2014/06/18
- [Qemu-devel] [PULL 04/11] memory: Don't update all memory region when ioeventfd changed, Paolo Bonzini, 2014/06/18
- Re: [Qemu-devel] [PULL 00/11] Memory API changes for 2014-06-18, Peter Maydell, 2014/06/18