{"id":814863,"url":"http://patchwork.ozlabs.org/api/patches/814863/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918101709.30421-7-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-7-aik@ozlabs.ru>","list_archive_url":null,"date":"2017-09-18T10:17:02","name":"[qemu,v3,06/13] memory: Remove AddressSpace pointer from AddressSpaceDispatch","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"aa20cabd363fcdbad9be157d679f9552851a810e","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-7-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/814863/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814863/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 3xwhmF4ynpz9s7M\n\tfor ;\n\tMon, 18 Sep 2017 20:18:21 +1000 (AEST)","from localhost ([::1]:35587 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtt87-0005mj-K6\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 06:18:19 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:41997)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtt7J-0005kR-4l\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtt7E-0004ER-V2\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:29 -0400","from ozlabs.ru ([107.173.13.209]:35246)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtt7E-0004DX-OG\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 06:17:24 -0400","from vpl1.ozlabs.ibm.com (localhost [IPv6:::1])\n\tby ozlabs.ru (Postfix) with ESMTP id 73F5C3A60054;\n\tMon, 18 Sep 2017 06:18:39 -0400 (EDT)"],"From":"Alexey Kardashevskiy ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 20:17:02 +1000","Message-Id":"<20170918101709.30421-7-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 06/13] memory: Remove AddressSpace\n\tpointer from AddressSpaceDispatch","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":"AS in ASD is only used to pass AS from mem_begin() to register_subpage()\nto store it in MemoryRegionSection, we can do this directly now.\n\nSigned-off-by: Alexey Kardashevskiy \n---\n exec.c | 15 +++++++--------\n 1 file changed, 7 insertions(+), 8 deletions(-)","diff":"diff --git a/exec.c b/exec.c\nindex 6b0211bafc..3212c5e70d 100644\n--- a/exec.c\n+++ b/exec.c\n@@ -194,7 +194,6 @@ struct AddressSpaceDispatch {\n */\n PhysPageEntry phys_map;\n PhysPageMap map;\n- AddressSpace *as;\n };\n \n #define SUBPAGE_IDX(addr) ((addr) & ~TARGET_PAGE_MASK)\n@@ -1304,7 +1303,8 @@ static void phys_sections_free(PhysPageMap *map)\n g_free(map->nodes);\n }\n \n-static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *section)\n+static void register_subpage(AddressSpace *as, AddressSpaceDispatch *d,\n+ MemoryRegionSection *section)\n {\n subpage_t *subpage;\n hwaddr base = section->offset_within_address_space\n@@ -1319,8 +1319,8 @@ static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection *secti\n assert(existing->mr->subpage || existing->mr == &io_mem_unassigned);\n \n if (!(existing->mr->subpage)) {\n- subpage = subpage_init(d->as, base);\n- subsection.address_space = d->as;\n+ subpage = subpage_init(as, base);\n+ subsection.address_space = as;\n subsection.mr = &subpage->iomem;\n phys_page_set(d, base >> TARGET_PAGE_BITS, 1,\n phys_section_add(&d->map, &subsection));\n@@ -1357,7 +1357,7 @@ void mem_add(AddressSpace *as, FlatView *fv, MemoryRegionSection *section)\n - now.offset_within_address_space;\n \n now.size = int128_min(int128_make64(left), now.size);\n- register_subpage(d, &now);\n+ register_subpage(as, d, &now);\n } else {\n now.size = int128_zero();\n }\n@@ -1367,10 +1367,10 @@ void mem_add(AddressSpace *as, 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(d, &now);\n+ register_subpage(as, d, &now);\n } else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK) {\n now.size = page_size;\n- register_subpage(d, &now);\n+ register_subpage(as, d, &now);\n } else {\n now.size = int128_and(now.size, int128_neg(page_size));\n register_multipage(d, &now);\n@@ -2686,7 +2686,6 @@ AddressSpaceDispatch *mem_begin(AddressSpace *as)\n assert(n == PHYS_SECTION_WATCH);\n \n d->phys_map = (PhysPageEntry) { .ptr = PHYS_MAP_NODE_NIL, .skip = 1 };\n- d->as = as;\n \n return d;\n }\n","prefixes":["qemu","v3","06/13"]}