From nobody Wed Feb 11 02:33:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506036448714380.4794868492585; Thu, 21 Sep 2017 16:27:28 -0700 (PDT) Received: from localhost ([::1]:55907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvAsG-000546-GN for importer@patchew.org; Thu, 21 Sep 2017 19:27:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvAiJ-0004f6-9R for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:17:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvAiH-00047v-1m for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:16:59 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:38019) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvAiG-00046k-Qn for qemu-devel@nongnu.org; Thu, 21 Sep 2017 19:16:56 -0400 Received: by mail-wr0-x241.google.com with SMTP id p37so3842058wrb.5 for ; Thu, 21 Sep 2017 16:16:56 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id u186sm2596278wmd.19.2017.09.21.16.16.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Sep 2017 16:16:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=40FxrlUSomwlv6Xsm+yAXqNI4JG15RUVyTtPbwvHyjc=; b=UidIHRpmbobzaewIzqCs+I7QrI/B7+rpIPiGV5Dc0RtiCyOfhotNtL/KYvrm7BoSpA R8YFIjIqRzIxzwe5uomVyOBR60fOkiEb4sD/D9dL4WGC4OqzBdBdyPPhdGakegS+QR21 d7txsjUosMZBNQVSqVpI6FPbzZpWv4ayI4KsjNQyID7vFW8r3dFqUgZ2PIXqMmWKi9np AOqWhVZeaLB3OXqgVzCzWP2CG+rzyfUTYukA/69OtB40Ad39hh/jyjFuTEOS7kpuEoYL 5WA7+PB0Ph3XmJ8pysQJdOOqeYIdq2ckEkOBrT1vd3xfPYTFrsylvWmoaJHRrrPmCX5d NtHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=40FxrlUSomwlv6Xsm+yAXqNI4JG15RUVyTtPbwvHyjc=; b=QScYToLctNOvMtMfwQWRBxML/7nedyS/bR9ryD8W6lHz1YCqk6Acr+v2qP2MijZKgK qIToC3tmcdHv+s7ZjyAeJQvaZOOAK6azekXvE+z5zEczoq1kEPyPzyXR2ivfIizkHJ23 c0gg9PWzDzNluvtjbe3qkHKn7b3m/DIuFs66UwLGBGSBGIq5f+t2pj0GxP/t9FbMaBYj daje4FQqqRjCOaj3SyzfiFwKTOFKa0RGhQ5QSBNR/HG4+L0zvgHB8r4yRKcBSJL2VVMS +Sc0JuPtDxxR0rsDTP2t9qK220Y0FTL27iMTdmoBEMRcRtAJ0e3UfbfTkwTMFEWxiViI j1GA== X-Gm-Message-State: AHPjjUi5eBGIw14CqZ7P8y5lFIaEiivoY0F8qtz++2M4+DRFy6ABVH66 vpZaKBIIs0//eIrThgJmeUiBl/Pz X-Google-Smtp-Source: AOwi7QBAvx7NK5sn1TUKaPhqYP+K8YX/QZa//QbXRcbi2DwUEAuxRAsKp2Ai/tjkC/aLK3AcsfT5XA== X-Received: by 10.223.133.164 with SMTP id 33mr3155641wrt.179.1506035815572; Thu, 21 Sep 2017 16:16:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 22 Sep 2017 01:16:18 +0200 Message-Id: <1506035800-30509-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1506035800-30509-1-git-send-email-pbonzini@redhat.com> References: <1506035800-30509-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 10/32] memory: Remove AddressSpace pointer from AddressSpaceDispatch X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Kardashevskiy Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Alexey Kardashevskiy AS in ASD is only used to pass AS from mem_begin() to register_subpage() to store it in MemoryRegionSection, we can do this directly now. This should cause no behavioural change. Signed-off-by: Alexey Kardashevskiy Message-Id: <20170921085110.25598-6-aik@ozlabs.ru> Signed-off-by: Paolo Bonzini --- exec.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/exec.c b/exec.c index afd6412..a54dde7 100644 --- a/exec.c +++ b/exec.c @@ -193,7 +193,6 @@ struct AddressSpaceDispatch { */ PhysPageEntry phys_map; PhysPageMap map; - AddressSpace *as; }; =20 #define SUBPAGE_IDX(addr) ((addr) & ~TARGET_PAGE_MASK) @@ -1303,7 +1302,8 @@ static void phys_sections_free(PhysPageMap *map) g_free(map->nodes); } =20 -static void register_subpage(AddressSpaceDispatch *d, MemoryRegionSection = *section) +static void register_subpage(AddressSpace *as, AddressSpaceDispatch *d, + MemoryRegionSection *section) { subpage_t *subpage; hwaddr base =3D section->offset_within_address_space @@ -1318,8 +1318,8 @@ static void register_subpage(AddressSpaceDispatch *d,= MemoryRegionSection *secti assert(existing->mr->subpage || existing->mr =3D=3D &io_mem_unassigned= ); =20 if (!(existing->mr->subpage)) { - subpage =3D subpage_init(d->as, base); - subsection.address_space =3D d->as; + subpage =3D subpage_init(as, base); + subsection.address_space =3D as; subsection.mr =3D &subpage->iomem; phys_page_set(d, base >> TARGET_PAGE_BITS, 1, phys_section_add(&d->map, &subsection)); @@ -1356,7 +1356,7 @@ void mem_add(AddressSpace *as, FlatView *fv, MemoryRe= gionSection *section) - now.offset_within_address_space; =20 now.size =3D int128_min(int128_make64(left), now.size); - register_subpage(d, &now); + register_subpage(as, d, &now); } else { now.size =3D int128_zero(); } @@ -1366,10 +1366,10 @@ void mem_add(AddressSpace *as, FlatView *fv, Memory= RegionSection *section) remain.offset_within_region +=3D int128_get64(now.size); now =3D remain; if (int128_lt(remain.size, page_size)) { - register_subpage(d, &now); + register_subpage(as, d, &now); } else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK)= { now.size =3D page_size; - register_subpage(d, &now); + register_subpage(as, d, &now); } else { now.size =3D int128_and(now.size, int128_neg(page_size)); register_multipage(d, &now); @@ -2685,7 +2685,6 @@ AddressSpaceDispatch *mem_begin(AddressSpace *as) assert(n =3D=3D PHYS_SECTION_WATCH); =20 d->phys_map =3D (PhysPageEntry) { .ptr =3D PHYS_MAP_NODE_NIL, .skip = =3D 1 }; - d->as =3D as; =20 return d; } --=20 1.8.3.1