Blame SOURCES/kvm-memory-Remove-AddressSpace-pointer-from-AddressSpace.patch

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