[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/32] memory: Remove AddressSpace pointer from Addre
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/32] memory: Remove AddressSpace pointer from AddressSpaceDispatch |
Date: |
Fri, 22 Sep 2017 01:16:18 +0200 |
From: Alexey Kardashevskiy <address@hidden>
AS in ASD is only used to pass AS from mem_begin() to register_subpage()
to store it in MemoryRegionSection, we can do this directly now.
This should cause no behavioural change.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
exec.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/exec.c b/exec.c
index afd6412..a54dde7 100644
--- a/exec.c
+++ b/exec.c
@@ -193,7 +193,6 @@ struct AddressSpaceDispatch {
*/
PhysPageEntry phys_map;
PhysPageMap map;
- AddressSpace *as;
};
#define SUBPAGE_IDX(addr) ((addr) & ~TARGET_PAGE_MASK)
@@ -1303,7 +1302,8 @@ static void phys_sections_free(PhysPageMap *map)
g_free(map->nodes);
}
-static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection
*section)
+static void register_subpage(AddressSpace *as, AddressSpaceDispatch *d,
+ MemoryRegionSection *section)
{
subpage_t *subpage;
hwaddr base = section->offset_within_address_space
@@ -1318,8 +1318,8 @@ static void register_subpage(AddressSpaceDispatch *d,
MemoryRegionSection *secti
assert(existing->mr->subpage || existing->mr == &io_mem_unassigned);
if (!(existing->mr->subpage)) {
- subpage = subpage_init(d->as, base);
- subsection.address_space = d->as;
+ subpage = subpage_init(as, base);
+ subsection.address_space = as;
subsection.mr = &subpage->iomem;
phys_page_set(d, base >> TARGET_PAGE_BITS, 1,
phys_section_add(&d->map, &subsection));
@@ -1356,7 +1356,7 @@ void mem_add(AddressSpace *as, FlatView *fv,
MemoryRegionSection *section)
- now.offset_within_address_space;
now.size = int128_min(int128_make64(left), now.size);
- register_subpage(d, &now);
+ register_subpage(as, d, &now);
} else {
now.size = int128_zero();
}
@@ -1366,10 +1366,10 @@ void mem_add(AddressSpace *as, FlatView *fv,
MemoryRegionSection *section)
remain.offset_within_region += int128_get64(now.size);
now = remain;
if (int128_lt(remain.size, page_size)) {
- register_subpage(d, &now);
+ register_subpage(as, d, &now);
} else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) {
now.size = page_size;
- register_subpage(d, &now);
+ register_subpage(as, d, &now);
} else {
now.size = int128_and(now.size, int128_neg(page_size));
register_multipage(d, &now);
@@ -2685,7 +2685,6 @@ AddressSpaceDispatch *mem_begin(AddressSpace *as)
assert(n == PHYS_SECTION_WATCH);
d->phys_map = (PhysPageEntry) { .ptr = PHYS_MAP_NODE_NIL, .skip = 1 };
- d->as = as;
return d;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/32] Misc changes for 2017-09-22, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 04/32] atomic: update documentation, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 06/32] exec: Explicitly export target AS from address_space_translate_internal, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 08/32] memory: Move FlatView allocation to a helper, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 07/32] memory: Open code FlatView rendering, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 01/32] virtio-serial: add enable_backend callback, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 02/32] kvm: drop wrong assertion creating problems with pflash, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 03/32] memory: avoid a name clash with access macro, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 05/32] memory: avoid "resurrection" of dead FlatViews, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 10/32] memory: Remove AddressSpace pointer from AddressSpaceDispatch,
Paolo Bonzini <=
- [Qemu-devel] [PULL 09/32] memory: Move AddressSpaceDispatch from AddressSpace to FlatView, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 13/32] memory: Rename mem_begin/mem_commit/mem_add helpers, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 12/32] memory: Cleanup after switching to FlatView, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 14/32] memory: Store physical root MR in FlatView, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 15/32] memory: Alloc dispatch tree where topology is generared, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 11/32] memory: Switch memory from using AddressSpace to FlatView, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 16/32] memory: Move address_space_update_ioeventfds, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 17/32] memory: Share FlatView's and dispatch trees between address spaces, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 18/32] memory: Do not allocate FlatView in address_space_init, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 21/32] memory: Create FlatView directly, Paolo Bonzini, 2017/09/21