From 1b3b5dcbfa953d50e2b9df7d620bb53234a4f477 Mon Sep 17 00:00:00 2001

From: David Gibson <dgibson@redhat.com>

Date: Thu, 16 Nov 2017 03:07:21 +0100

Subject: [PATCH 17/30] memory: Rename mem_begin/mem_commit/mem_add helpers

RH-Author: David Gibson <dgibson@redhat.com>

Message-id: <20171116030732.8560-12-dgibson@redhat.com>

Patchwork-id: 77698

O-Subject: [PATCH 11/22] memory: Rename mem_begin/mem_commit/mem_add helpers

Bugzilla: 1481593

RH-Acked-by: Thomas Huth <thuth@redhat.com>

RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>

RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

From: Alexey Kardashevskiy <aik@ozlabs.ru>

This renames some helpers to reflect better what they do.

This should cause no behavioural change.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Message-Id: <20170921085110.25598-9-aik@ozlabs.ru>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit 8629d3fcb77e9775e44d9051bad0fb5187925eae)

Signed-off-by: David Gibson <dgibson@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 exec.c                         | 12 +++---------

 include/exec/memory-internal.h |  6 +++---

 memory.c                       |  6 +++---

 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/exec.c b/exec.c

index d1d8486..1b30e1e 100644

--- a/exec.c

+++ b/exec.c

@@ -359,7 +359,7 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes)

     }

 }

-static void phys_page_compact_all(AddressSpaceDispatch *d, int nodes_nb)

+void address_space_dispatch_compact(AddressSpaceDispatch *d)

 {

     if (d->phys_map.skip) {

         phys_page_compact(&d->phys_map, d->map.nodes);

@@ -1358,7 +1358,7 @@ static void register_multipage(FlatView *fv,

     phys_page_set(d, start_addr >> TARGET_PAGE_BITS, num_pages, section_index);

 }

-void mem_add(FlatView *fv, MemoryRegionSection *section)

+void flatview_add_to_dispatch(FlatView *fv, MemoryRegionSection *section)

 {

     MemoryRegionSection now = *section, remain = *section;

     Int128 page_size = int128_make64(TARGET_PAGE_SIZE);

@@ -2684,9 +2684,8 @@ static void io_mem_init(void)

                           NULL, UINT64_MAX);

 }

-AddressSpaceDispatch *mem_begin(AddressSpace *as)

+AddressSpaceDispatch *address_space_dispatch_new(FlatView *fv)

 {

-    FlatView *fv = address_space_to_flatview(as);

     AddressSpaceDispatch *d = g_new0(AddressSpaceDispatch, 1);

     uint16_t n;

@@ -2710,11 +2709,6 @@ void address_space_dispatch_free(AddressSpaceDispatch *d)

     g_free(d);

 }

-void mem_commit(AddressSpaceDispatch *d)

-{

-    phys_page_compact_all(d, d->map.nodes_nb);

-}

-

 static void tcg_commit(MemoryListener *listener)

 {

     CPUAddressSpace *cpuas;

diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h

index 1cf8ad9..d4a35c6 100644

--- a/include/exec/memory-internal.h

+++ b/include/exec/memory-internal.h

@@ -27,9 +27,9 @@ extern const MemoryRegionOps unassigned_mem_ops;

 bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr,

                                 unsigned size, bool is_write);

-void mem_add(FlatView *fv, MemoryRegionSection *section);

-AddressSpaceDispatch *mem_begin(AddressSpace *as);

-void mem_commit(AddressSpaceDispatch *d);

+void flatview_add_to_dispatch(FlatView *fv, MemoryRegionSection *section);

+AddressSpaceDispatch *address_space_dispatch_new(FlatView *fv);

+void address_space_dispatch_compact(AddressSpaceDispatch *d);

 AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as);

 AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv);

diff --git a/memory.c b/memory.c

index 6678a53..b7d2536 100644

--- a/memory.c

+++ b/memory.c

@@ -909,13 +909,13 @@ static void address_space_update_topology(AddressSpace *as)

     FlatView *new_view = generate_memory_topology(as->root);

     int i;

-    new_view->dispatch = mem_begin(as);

+    new_view->dispatch = address_space_dispatch_new(new_view);

     for (i = 0; i < new_view->nr; i++) {

         MemoryRegionSection mrs =

             section_from_flat_range(&new_view->ranges[i], new_view);

-        mem_add(new_view, &mrs);

+        flatview_add_to_dispatch(new_view, &mrs);

     }

-    mem_commit(new_view->dispatch);

+    address_space_dispatch_compact(new_view->dispatch);

     if (!QTAILQ_EMPTY(&as->listeners)) {

         address_space_update_topology_pass(as, old_view, new_view, false);

-- 

1.8.3.1