[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qemu v2 09/13] memory: Rename mem_begin/mem_commit/m
From: |
Alexey Kardashevskiy |
Subject: |
[Qemu-devel] [PATCH qemu v2 09/13] memory: Rename mem_begin/mem_commit/mem_add helpers |
Date: |
Fri, 15 Sep 2017 18:40:26 +1000 |
This renames some helper to reflect better what they do.
This drops AS in address_space_update_flatview() as it is not used anymore
and renames to flatview_render_new().
Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
include/exec/memory-internal.h | 6 +++---
exec.c | 7 +++----
memory.c | 14 ++++++--------
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
index c8a5522510..e87a30fcae 100644
--- a/include/exec/memory-internal.h
+++ b/include/exec/memory-internal.h
@@ -28,9 +28,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_mem_add(FlatView *fv, MemoryRegionSection *section);
+AddressSpaceDispatch *address_space_dispatch_alloc(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/exec.c b/exec.c
index 3e02b82c05..11e0e3c927 100644
--- a/exec.c
+++ b/exec.c
@@ -1347,7 +1347,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_mem_add(FlatView *fv, MemoryRegionSection *section)
{
MemoryRegionSection now = *section, remain = *section;
Int128 page_size = int128_make64(TARGET_PAGE_SIZE);
@@ -2673,9 +2673,8 @@ static void io_mem_init(void)
NULL, UINT64_MAX);
}
-AddressSpaceDispatch *mem_begin(AddressSpace *as)
+AddressSpaceDispatch *address_space_dispatch_alloc(FlatView *fv)
{
- FlatView *fv = address_space_to_flatview(as);
AddressSpaceDispatch *d = g_new0(AddressSpaceDispatch, 1);
uint16_t n;
@@ -2699,7 +2698,7 @@ void address_space_dispatch_free(AddressSpaceDispatch *d)
g_free(d);
}
-void mem_commit(AddressSpaceDispatch *d)
+void address_space_dispatch_compact(AddressSpaceDispatch *d)
{
phys_page_compact_all(d, d->map.nodes_nb);
}
diff --git a/memory.c b/memory.c
index 0f51445d30..0651be49ac 100644
--- a/memory.c
+++ b/memory.c
@@ -900,14 +900,12 @@ static void
address_space_update_topology_pass(AddressSpace *as,
}
}
-static void address_space_update_flatview(AddressSpace *as,
- FlatView *old_view,
- FlatView *new_view)
+static void flatview_render_new(FlatView *old_view, FlatView *new_view)
{
unsigned iold, inew;
FlatRange *frold, *frnew;
- new_view->dispatch = mem_begin(as);
+ new_view->dispatch = address_space_dispatch_alloc(new_view);
/*
* FIXME: this is cut-n-paste from address_space_update_topology_pass,
* simplify it
@@ -935,7 +933,7 @@ static void address_space_update_flatview(AddressSpace *as,
/* In both and unchanged (except logging may have changed) */
MemoryRegionSection mrs = section_from_flat_range(frnew, new_view);
- mem_add(new_view, &mrs);
+ flatview_mem_add(new_view, &mrs);
++iold;
++inew;
@@ -943,12 +941,12 @@ static void address_space_update_flatview(AddressSpace
*as,
/* In new */
MemoryRegionSection mrs = section_from_flat_range(frnew, new_view);
- mem_add(new_view, &mrs);
+ flatview_mem_add(new_view, &mrs);
++inew;
}
}
- mem_commit(new_view->dispatch);
+ address_space_dispatch_compact(new_view->dispatch);
}
static void address_space_update_topology(AddressSpace *as)
@@ -956,7 +954,7 @@ static void address_space_update_topology(AddressSpace *as)
FlatView *old_view = address_space_get_flatview(as);
FlatView *new_view = generate_memory_topology(as->root);
- address_space_update_flatview(as, old_view, new_view);
+ flatview_render_new(old_view, new_view);
address_space_update_topology_pass(as, old_view, new_view, false);
address_space_update_topology_pass(as, old_view, new_view, true);
--
2.11.0
- [Qemu-devel] [PATCH qemu v2 00/13] memory: Reduce memory use, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 03/13] memory: Open code FlatView rendering, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 04/13] memory: Move FlatView allocation to a helper, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 06/13] memory: Remove AddressSpace pointer from AddressSpaceDispatch, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 08/13] memory: Cleanup after switching to FlatView, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 09/13] memory: Rename mem_begin/mem_commit/mem_add helpers,
Alexey Kardashevskiy <=
- [Qemu-devel] [PATCH qemu v2 10/13] memory: Move root MR from AddressSpace to FlatView, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 12/13] memory: Get rid of address_space_init_shareable, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 11/13] memory: Share FlatView's and dispatch trees between address spaces, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 07/13] memory: Switch memory from using AddressSpace to FlatView, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 13/13] memory: Add flat views to HMP "info mtree", Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 02/13] exec: Explicitely export target AS from address_space_translate_internal, Alexey Kardashevskiy, 2017/09/15
- [Qemu-devel] [PATCH qemu v2 01/13] memory: Postpone flatview and dispatch tree building till all devices are added, Alexey Kardashevskiy, 2017/09/15