[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/32] memory: Rename mem_begin/mem_commit/mem_add he
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 13/32] memory: Rename mem_begin/mem_commit/mem_add helpers |
Date: |
Fri, 22 Sep 2017 01:16:21 +0200 |
From: Alexey Kardashevskiy <address@hidden>
This renames some helpers to reflect better what they do.
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 | 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 548ec71..b085f82 100644
--- a/exec.c
+++ b/exec.c
@@ -358,7 +358,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);
@@ -1346,7 +1346,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);
@@ -2672,9 +2672,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;
@@ -2698,11 +2697,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 bf3728a..c374317 100644
--- a/memory.c
+++ b/memory.c
@@ -910,13 +910,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
- [Qemu-devel] [PULL 04/32] atomic: update documentation, (continued)
- [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, 2017/09/21
- [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 <=
- [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
- [Qemu-devel] [PULL 23/32] memory: seek FlatView sharing candidates among children subregions, Paolo Bonzini, 2017/09/21
- [Qemu-devel] [PULL 20/32] memory: Get rid of address_space_init_shareable, Paolo Bonzini, 2017/09/21