{"id":814869,"url":"http://patchwork.ozlabs.org/api/patches/814869/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918101709.30421-9-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":"<20170918101709.30421-9-aik@ozlabs.ru>","list_archive_url":null,"date":"2017-09-18T10:17:04","name":"[qemu,v3,08/13] memory: Cleanup after switching to FlatView","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"70c1d180b7b65248de8c0ca44c5d2a8a1bd25adb","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/20170918101709.30421-9-aik@ozlabs.ru/mbox/","series":[{"id":3617,"url":"http://patchwork.ozlabs.org/api/series/3617/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3617","date":"2017-09-18T10:16:57","name":"memory: Reduce memory use","version":3,"mbox":"http://patchwork.ozlabs.org/series/3617/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814869/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814869/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 3xwhrC1g5bz9s78\n\tfor ;\n\tMon, 18 Sep 2017 20:21:47 +1000 (AEST)","from localhost ([::1]:35605 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dttBR-0000LK-Ag\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 06:21:45 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:42024)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtt7K-0005l4-3K\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtt7H-0004FX-87\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:30 -0400","from ozlabs.ru ([107.173.13.209]:35254)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtt7H-0004Dh-1e\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:27 -0400","from vpl1.ozlabs.ibm.com (localhost [IPv6:::1])\n\tby ozlabs.ru (Postfix) with ESMTP id D05373A60054;\n\tMon, 18 Sep 2017 06:18:41 -0400 (EDT)"],"From":"Alexey Kardashevskiy ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 20:17:04 +1000","Message-Id":"<20170918101709.30421-9-aik@ozlabs.ru>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170918101709.30421-1-aik@ozlabs.ru>","References":"<20170918101709.30421-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 v3 08/13] memory: Cleanup after switching\n\tto FlatView","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":"We store AddressSpaceDispatch* in FlatView anyway so there is no need\nto carry it from mem_add() to register_subpage/register_multipage.\n\nSigned-off-by: Alexey Kardashevskiy \n---\n exec.c | 16 ++++++++--------\n 1 file changed, 8 insertions(+), 8 deletions(-)","diff":"diff --git a/exec.c b/exec.c\nindex b561098df3..3e02b82c05 100644\n--- a/exec.c\n+++ b/exec.c\n@@ -1303,9 +1303,9 @@ static void phys_sections_free(PhysPageMap *map)\n g_free(map->nodes);\n }\n \n-static void register_subpage(FlatView *fv, AddressSpaceDispatch *d,\n- MemoryRegionSection *section)\n+static void register_subpage(FlatView *fv, MemoryRegionSection *section)\n {\n+ AddressSpaceDispatch *d = flatview_to_dispatch(fv);\n subpage_t *subpage;\n hwaddr base = section->offset_within_address_space\n & TARGET_PAGE_MASK;\n@@ -1334,9 +1334,10 @@ static void register_subpage(FlatView *fv, AddressSpaceDispatch *d,\n }\n \n \n-static void register_multipage(AddressSpaceDispatch *d,\n+static void register_multipage(FlatView *fv,\n MemoryRegionSection *section)\n {\n+ AddressSpaceDispatch *d = flatview_to_dispatch(fv);\n hwaddr start_addr = section->offset_within_address_space;\n uint16_t section_index = phys_section_add(&d->map, section);\n uint64_t num_pages = int128_get64(int128_rshift(section->size,\n@@ -1348,7 +1349,6 @@ static void register_multipage(AddressSpaceDispatch *d,\n \n void mem_add(FlatView *fv, MemoryRegionSection *section)\n {\n- AddressSpaceDispatch *d = flatview_to_dispatch(fv);\n MemoryRegionSection now = *section, remain = *section;\n Int128 page_size = int128_make64(TARGET_PAGE_SIZE);\n \n@@ -1357,7 +1357,7 @@ void mem_add(FlatView *fv, MemoryRegionSection *section)\n - now.offset_within_address_space;\n \n now.size = int128_min(int128_make64(left), now.size);\n- register_subpage(fv, d, &now);\n+ register_subpage(fv, &now);\n } else {\n now.size = int128_zero();\n }\n@@ -1367,13 +1367,13 @@ void mem_add(FlatView *fv, MemoryRegionSection *section)\n remain.offset_within_region += int128_get64(now.size);\n now = remain;\n if (int128_lt(remain.size, page_size)) {\n- register_subpage(fv, d, &now);\n+ register_subpage(fv, &now);\n } else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) {\n now.size = page_size;\n- register_subpage(fv, d, &now);\n+ register_subpage(fv, &now);\n } else {\n now.size = int128_and(now.size, int128_neg(page_size));\n- register_multipage(d, &now);\n+ register_multipage(fv, &now);\n }\n }\n }\n","prefixes":["qemu","v3","08/13"]}