{"id":814150,"url":"http://patchwork.ozlabs.org/api/patches/814150/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170915084030.40988-10-aik@ozlabs.ru/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170915084030.40988-10-aik@ozlabs.ru>","list_archive_url":null,"date":"2017-09-15T08:40:26","name":"[qemu,v2,09/13] memory: Rename mem_begin/mem_commit/mem_add helpers","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"85245e894db70ea368166c29d01e4371f76af3a6","submitter":{"id":7621,"url":"http://patchwork.ozlabs.org/api/people/7621/?format=json","name":"Alexey Kardashevskiy","email":"aik@ozlabs.ru"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170915084030.40988-10-aik@ozlabs.ru/mbox/","series":[{"id":3250,"url":"http://patchwork.ozlabs.org/api/series/3250/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3250","date":"2017-09-15T08:40:21","name":"memory: Reduce memory use","version":2,"mbox":"http://patchwork.ozlabs.org/series/3250/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814150/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814150/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xtppk6lhYz9s3w\n\tfor ;\n\tFri, 15 Sep 2017 18:43:58 +1000 (AEST)","from localhost ([::1]:51961 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsmE9-0001w9-0b\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 04:43:57 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:38203)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsmB5-0006xU-6F\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 04:40:48 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsmB4-0002WM-10\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 04:40:47 -0400","from ozlabs.ru ([107.173.13.209]:44668)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsmB3-0002Ql-NT\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 04:40:45 -0400","from vpl1.ozlabs.ibm.com (localhost [IPv6:::1])\n\tby ozlabs.ru (Postfix) with ESMTP id 303113A6005F;\n\tFri, 15 Sep 2017 04:41:59 -0400 (EDT)"],"From":"Alexey Kardashevskiy ","To":"qemu-devel@nongnu.org","Date":"Fri, 15 Sep 2017 18:40:26 +1000","Message-Id":"<20170915084030.40988-10-aik@ozlabs.ru>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170915084030.40988-1-aik@ozlabs.ru>","References":"<20170915084030.40988-1-aik@ozlabs.ru>","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [fuzzy]","X-Received-From":"107.173.13.209","Subject":"[Qemu-devel] [PATCH qemu v2 09/13] memory: Rename\n\tmem_begin/mem_commit/mem_add helpers","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Alexey Kardashevskiy , Paolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This renames some helper to reflect better what they do.\n\nThis drops AS in address_space_update_flatview() as it is not used anymore\nand renames to flatview_render_new().\n\nSigned-off-by: Alexey Kardashevskiy \n---\n include/exec/memory-internal.h | 6 +++---\n exec.c | 7 +++----\n memory.c | 14 ++++++--------\n 3 files changed, 12 insertions(+), 15 deletions(-)","diff":"diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h\nindex c8a5522510..e87a30fcae 100644\n--- a/include/exec/memory-internal.h\n+++ b/include/exec/memory-internal.h\n@@ -28,9 +28,9 @@ extern const MemoryRegionOps unassigned_mem_ops;\n bool memory_region_access_valid(MemoryRegion *mr, hwaddr addr,\n unsigned size, bool is_write);\n \n-void mem_add(FlatView *fv, MemoryRegionSection *section);\n-AddressSpaceDispatch *mem_begin(AddressSpace *as);\n-void mem_commit(AddressSpaceDispatch *d);\n+void flatview_mem_add(FlatView *fv, MemoryRegionSection *section);\n+AddressSpaceDispatch *address_space_dispatch_alloc(FlatView *fv);\n+void address_space_dispatch_compact(AddressSpaceDispatch *d);\n \n AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as);\n AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv);\ndiff --git a/exec.c b/exec.c\nindex 3e02b82c05..11e0e3c927 100644\n--- a/exec.c\n+++ b/exec.c\n@@ -1347,7 +1347,7 @@ static void register_multipage(FlatView *fv,\n phys_page_set(d, start_addr >> TARGET_PAGE_BITS, num_pages, section_index);\n }\n \n-void mem_add(FlatView *fv, MemoryRegionSection *section)\n+void flatview_mem_add(FlatView *fv, MemoryRegionSection *section)\n {\n MemoryRegionSection now = *section, remain = *section;\n Int128 page_size = int128_make64(TARGET_PAGE_SIZE);\n@@ -2673,9 +2673,8 @@ static void io_mem_init(void)\n NULL, UINT64_MAX);\n }\n \n-AddressSpaceDispatch *mem_begin(AddressSpace *as)\n+AddressSpaceDispatch *address_space_dispatch_alloc(FlatView *fv)\n {\n- FlatView *fv = address_space_to_flatview(as);\n AddressSpaceDispatch *d = g_new0(AddressSpaceDispatch, 1);\n uint16_t n;\n \n@@ -2699,7 +2698,7 @@ void address_space_dispatch_free(AddressSpaceDispatch *d)\n g_free(d);\n }\n \n-void mem_commit(AddressSpaceDispatch *d)\n+void address_space_dispatch_compact(AddressSpaceDispatch *d)\n {\n phys_page_compact_all(d, d->map.nodes_nb);\n }\ndiff --git a/memory.c b/memory.c\nindex 0f51445d30..0651be49ac 100644\n--- a/memory.c\n+++ b/memory.c\n@@ -900,14 +900,12 @@ static void address_space_update_topology_pass(AddressSpace *as,\n }\n }\n \n-static void address_space_update_flatview(AddressSpace *as,\n- FlatView *old_view,\n- FlatView *new_view)\n+static void flatview_render_new(FlatView *old_view, FlatView *new_view)\n {\n unsigned iold, inew;\n FlatRange *frold, *frnew;\n \n- new_view->dispatch = mem_begin(as);\n+ new_view->dispatch = address_space_dispatch_alloc(new_view);\n /*\n * FIXME: this is cut-n-paste from address_space_update_topology_pass,\n * simplify it\n@@ -935,7 +933,7 @@ static void address_space_update_flatview(AddressSpace *as,\n /* In both and unchanged (except logging may have changed) */\n MemoryRegionSection mrs = section_from_flat_range(frnew, new_view);\n \n- mem_add(new_view, &mrs);\n+ flatview_mem_add(new_view, &mrs);\n \n ++iold;\n ++inew;\n@@ -943,12 +941,12 @@ static void address_space_update_flatview(AddressSpace *as,\n /* In new */\n MemoryRegionSection mrs = section_from_flat_range(frnew, new_view);\n \n- mem_add(new_view, &mrs);\n+ flatview_mem_add(new_view, &mrs);\n \n ++inew;\n }\n }\n- mem_commit(new_view->dispatch);\n+ address_space_dispatch_compact(new_view->dispatch);\n }\n \n static void address_space_update_topology(AddressSpace *as)\n@@ -956,7 +954,7 @@ static void address_space_update_topology(AddressSpace *as)\n FlatView *old_view = address_space_get_flatview(as);\n FlatView *new_view = generate_memory_topology(as->root);\n \n- address_space_update_flatview(as, old_view, new_view);\n+ flatview_render_new(old_view, new_view);\n address_space_update_topology_pass(as, old_view, new_view, false);\n address_space_update_topology_pass(as, old_view, new_view, true);\n \n","prefixes":["qemu","v2","09/13"]}