[{"id":1769066,"web_url":"http://patchwork.ozlabs.org/comment/1769066/","msgid":"","list_archive_url":null,"date":"2017-09-15T09:10:26","subject":"Re: [Qemu-devel] [PATCH qemu v2 09/13] memory: Rename\n\tmem_begin/mem_commit/mem_add helpers","submitter":{"id":2701,"url":"http://patchwork.ozlabs.org/api/people/2701/","name":"Paolo Bonzini","email":"pbonzini@redhat.com"},"content":"On 15/09/2017 10:40, Alexey Kardashevskiy wrote:\n> This renames some helper to reflect better what they do.\n> \n> This drops AS in address_space_update_flatview() as it is not used anymore\n> and renames to flatview_render_new().\n> \n> Signed-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(-)\n> \n> diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h\n> index 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\nMaybe flatview_add_to_dispatch?\n\n> +AddressSpaceDispatch *address_space_dispatch_alloc(FlatView *fv);\n> +void address_space_dispatch_compact(AddressSpaceDispatch *d);\n\nphys_page_compact_all does not use nodes_nb so you can just remove the\nindirection and rename phys_page_compact_all to\naddress_space_dispatch_compact.\n\n> AddressSpaceDispatch *address_space_to_dispatch(AddressSpace *as);\n> AddressSpaceDispatch *flatview_to_dispatch(FlatView *fv);\n> diff --git a/exec.c b/exec.c\n> index 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> }\n> diff --git a/memory.c b/memory.c\n> index 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\nAccording to the remark in patch 3, old_view is not needed here (which\nmakes sense since each AddressSpaceDispatch is rebuilt from scratch).\n\nThanks,\n\nPaolo\n\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>","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=)","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=pbonzini@redhat.com"],"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 3xtqVc0Vwcz9sPs\n\tfor ;\n\tFri, 15 Sep 2017 19:15:04 +1000 (AEST)","from localhost ([::1]:52153 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsmiE-0008Vi-62\n\tfor incoming@patchwork.ozlabs.org; Fri, 15 Sep 2017 05:15:02 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:50755)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsmdt-0004eu-Ui\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 05:10:35 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsmdp-0007PN-IE\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 05:10:33 -0400","from mx1.redhat.com ([209.132.183.28]:47728)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dsmdp-0007OS-9f\n\tfor qemu-devel@nongnu.org; Fri, 15 Sep 2017 05:10:29 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 6D3355D687;\n\tFri, 15 Sep 2017 09:10:28 +0000 (UTC)","from [10.36.117.159] (ovpn-117-159.ams2.redhat.com [10.36.117.159])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 8246217AC0;\n\tFri, 15 Sep 2017 09:10:27 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 6D3355D687","To":"Alexey Kardashevskiy , qemu-devel@nongnu.org","References":"<20170915084030.40988-1-aik@ozlabs.ru>\n\t<20170915084030.40988-10-aik@ozlabs.ru>","From":"Paolo Bonzini ","Message-ID":"","Date":"Fri, 15 Sep 2017 11:10:26 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<20170915084030.40988-10-aik@ozlabs.ru>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-US","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tFri, 15 Sep 2017 09:10:28 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"Re: [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","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]