|
 |
4a2fec |
From 4fe0681fd4d203f6db9f6f025c373a5550c428c7 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
Date: Thu, 16 Nov 2017 03:07:18 +0100
|
|
|
4a2fec |
Subject: [PATCH 14/30] memory: Remove AddressSpace pointer from
|
|
|
4a2fec |
AddressSpaceDispatch
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
Message-id: <20171116030732.8560-9-dgibson@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 77700
|
|
|
4a2fec |
O-Subject: [PATCH 08/22] memory: Remove AddressSpace pointer from AddressSpaceDispatch
|
|
|
4a2fec |
Bugzilla: 1481593
|
|
|
4a2fec |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
From: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
4a2fec |
|
|
|
4a2fec |
AS in ASD is only used to pass AS from mem_begin() to register_subpage()
|
|
|
4a2fec |
to store it in MemoryRegionSection, we can do this directly now.
|
|
|
4a2fec |
|
|
|
4a2fec |
This should cause no behavioural change.
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
|
|
|
4a2fec |
Message-Id: <20170921085110.25598-6-aik@ozlabs.ru>
|
|
|
4a2fec |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit c7752523787dc148f5ee976162e80ab594c386a1)
|
|
|
4a2fec |
|
|
|
4a2fec |
Signed-off-by: David Gibson <dgibson@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
exec.c | 15 +++++++--------
|
|
|
4a2fec |
1 file changed, 7 insertions(+), 8 deletions(-)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/exec.c b/exec.c
|
|
|
4a2fec |
index 3c0b4f8..6b84771 100644
|
|
|
4a2fec |
--- a/exec.c
|
|
|
4a2fec |
+++ b/exec.c
|
|
|
4a2fec |
@@ -194,7 +194,6 @@ struct AddressSpaceDispatch {
|
|
|
4a2fec |
*/
|
|
|
4a2fec |
PhysPageEntry phys_map;
|
|
|
4a2fec |
PhysPageMap map;
|
|
|
4a2fec |
- AddressSpace *as;
|
|
|
4a2fec |
};
|
|
|
4a2fec |
|
|
|
4a2fec |
#define SUBPAGE_IDX(addr) ((addr) & ~TARGET_PAGE_MASK)
|
|
|
4a2fec |
@@ -1314,7 +1313,8 @@ static void phys_sections_free(PhysPageMap *map)
|
|
|
4a2fec |
g_free(map->nodes);
|
|
|
4a2fec |
}
|
|
|
4a2fec |
|
|
|
4a2fec |
-static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *section)
|
|
|
4a2fec |
+static void register_subpage(AddressSpace *as, AddressSpaceDispatch *d,
|
|
|
4a2fec |
+ MemoryRegionSection *section)
|
|
|
4a2fec |
{
|
|
|
4a2fec |
subpage_t *subpage;
|
|
|
4a2fec |
hwaddr base = section->offset_within_address_space
|
|
|
4a2fec |
@@ -1329,8 +1329,8 @@ static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *secti
|
|
|
4a2fec |
assert(existing->mr->subpage || existing->mr == &io_mem_unassigned);
|
|
|
4a2fec |
|
|
|
4a2fec |
if (!(existing->mr->subpage)) {
|
|
|
4a2fec |
- subpage = subpage_init(d->as, base);
|
|
|
4a2fec |
- subsection.address_space = d->as;
|
|
|
4a2fec |
+ subpage = subpage_init(as, base);
|
|
|
4a2fec |
+ subsection.address_space = as;
|
|
|
4a2fec |
subsection.mr = &subpage->iomem;
|
|
|
4a2fec |
phys_page_set(d, base >> TARGET_PAGE_BITS, 1,
|
|
|
4a2fec |
phys_section_add(&d->map, &subsection));
|
|
|
4a2fec |
@@ -1367,7 +1367,7 @@ void mem_add(AddressSpace *as, FlatView *fv, MemoryRegionSection *section)
|
|
|
4a2fec |
- now.offset_within_address_space;
|
|
|
4a2fec |
|
|
|
4a2fec |
now.size = int128_min(int128_make64(left), now.size);
|
|
|
4a2fec |
- register_subpage(d, &now;;
|
|
|
4a2fec |
+ register_subpage(as, d, &now;;
|
|
|
4a2fec |
} else {
|
|
|
4a2fec |
now.size = int128_zero();
|
|
|
4a2fec |
}
|
|
|
4a2fec |
@@ -1377,10 +1377,10 @@ void mem_add(AddressSpace *as, FlatView *fv, MemoryRegionSection *section)
|
|
|
4a2fec |
remain.offset_within_region += int128_get64(now.size);
|
|
|
4a2fec |
now = remain;
|
|
|
4a2fec |
if (int128_lt(remain.size, page_size)) {
|
|
|
4a2fec |
- register_subpage(d, &now;;
|
|
|
4a2fec |
+ register_subpage(as, d, &now;;
|
|
|
4a2fec |
} else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) {
|
|
|
4a2fec |
now.size = page_size;
|
|
|
4a2fec |
- register_subpage(d, &now;;
|
|
|
4a2fec |
+ register_subpage(as, d, &now;;
|
|
|
4a2fec |
} else {
|
|
|
4a2fec |
now.size = int128_and(now.size, int128_neg(page_size));
|
|
|
4a2fec |
register_multipage(d, &now;;
|
|
|
4a2fec |
@@ -2696,7 +2696,6 @@ AddressSpaceDispatch *mem_begin(AddressSpace *as)
|
|
|
4a2fec |
assert(n == PHYS_SECTION_WATCH);
|
|
|
4a2fec |
|
|
|
4a2fec |
d->phys_map = (PhysPageEntry) { .ptr = PHYS_MAP_NODE_NIL, .skip = 1 };
|
|
|
4a2fec |
- d->as = as;
|
|
|
4a2fec |
|
|
|
4a2fec |
return d;
|
|
|
4a2fec |
}
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|