From nobody Fri Nov 7 00:47:20 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544628714540337.35222499118413; Wed, 12 Dec 2018 07:31:54 -0800 (PST) Received: from localhost ([::1]:45603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6UL-0007Mg-9Q for importer@patchew.org; Wed, 12 Dec 2018 10:31:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gX6MR-0000hF-3o for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gX6MO-00007Y-I8 for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:42 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:55386) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gX6MK-0008OL-Op for qemu-devel@nongnu.org; Wed, 12 Dec 2018 10:23:38 -0500 Received: by mail-wm1-x32d.google.com with SMTP id y139so6132306wmc.5 for ; Wed, 12 Dec 2018 07:23:29 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id u10sm15878859wrr.33.2018.12.12.07.23.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Dec 2018 07:23:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=J2D6lcwPWcdNjYAiutJXEhmrCqM8BF8vw582jFL8R7k=; b=nX6KtpyCAEO1L8MQ1mwQXld5iFBiWodKKoBUbrVtgM7se33gZCnKf75p8pNk854Z2H lTEhySRqP/ZxEAXCaR9sgmxwtwZGUN2JqqCQ1CFic/rZLYoY8gpF36XCL1knrjaDdmCM VloB+0QfBRogEHU2EbziEs5gHOtRNnpCXB37ewv14vHyBD+XCFqOoZ8ckl4psfAa/GFI ig5418iWAEFjAZZaAoMiJiXEO0j8mITL65Arc1R0CLCQhqUcHcALCRla7g1tDuXQBIdR W84IJ3uJBKzy7tx0hH2+AO9sEX5+FkYnfPN9mhmJB//B+EK4wwUbkMKGFTwAW3Z5i7uM VWew== 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:subject:date:message-id :in-reply-to:references; bh=J2D6lcwPWcdNjYAiutJXEhmrCqM8BF8vw582jFL8R7k=; b=C5L7uRMUWlx6a5tdtY+Q6hiWchvLpUA1S/gOAD4UAXko/Adze/hIczFly2yJBumDte Hg0YZuCa+pxuAdq2jo2OVvB9fb9W5nEsw+ZUGry9DjQOjhbBqS6wlCk9IhXp3ZIoXwR6 N0xmkbfNoxzbnrjtEqYX6bhIrwJ+8eeCamKCk5IiCkiFHXRmQasf5q/RYLn5D5eT/d1z HLC2vPZGmRfSHBZ8ewBxUc+xWgXHF4FNjRjKE4LWYDxaC68vNjbGHg1qyZQtrTxFstiW u14FsmdkZa1CtyyKeRIl4SNmxDFYIHL5lXt0BbsNAe89alZwx9iATdV8XJOecR0XwkrR IL0w== X-Gm-Message-State: AA+aEWbRYfg9U01K8Xb1y6fYOF9DKQFGIbQNUEC3Hu7jrqF+Ze/q49bA BIUidK4lQRGslGt81fb6NQfiBjlj X-Google-Smtp-Source: AFSGD/VSVR5M2x49uQKWb3a1NOLdrXml7/bAdY9rzuZcczHnYlOFyoa4+Mxckh52zL4cmpoYTOglQQ== X-Received: by 2002:a1c:8acf:: with SMTP id m198mr7140278wmd.143.1544628207913; Wed, 12 Dec 2018 07:23:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 12 Dec 2018 16:22:29 +0100 Message-Id: <1544628195-37728-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1544628195-37728-1-git-send-email-pbonzini@redhat.com> References: <1544628195-37728-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:4864:20::32d Subject: [Qemu-devel] [PULL 08/54] memory: extract flat_range_coalesced_io_{del, add} 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Extract two new functions from memory_region_update_coalesced_range_as. To avoid duplication in the creation of the MemoryRegionSection, use MEMORY_LISTENER_UPDATE_REGION instead of MEMORY_LISTENER_CALL to invoke the listener callback. Signed-off-by: Paolo Bonzini --- memory.c | 53 +++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/memory.c b/memory.c index d14c6de..119b6e4 100644 --- a/memory.c +++ b/memory.c @@ -850,6 +850,33 @@ static void address_space_update_ioeventfds(AddressSpa= ce *as) flatview_unref(view); } =20 +static void flat_range_coalesced_io_del(FlatRange *fr, AddressSpace *as) +{ + MEMORY_LISTENER_UPDATE_REGION(fr, as, Reverse, coalesced_io_del, + int128_get64(fr->addr.start), + int128_get64(fr->addr.size)); +} + +static void flat_range_coalesced_io_add(FlatRange *fr, AddressSpace *as) +{ + MemoryRegion *mr =3D fr->mr; + CoalescedMemoryRange *cmr; + AddrRange tmp; + + QTAILQ_FOREACH(cmr, &mr->coalesced, link) { + tmp =3D addrrange_shift(cmr->addr, + int128_sub(fr->addr.start, + int128_make64(fr->offset_in_regio= n))); + if (!addrrange_intersects(tmp, fr->addr)) { + continue; + } + tmp =3D addrrange_intersection(tmp, fr->addr); + MEMORY_LISTENER_UPDATE_REGION(fr, as, Forward, coalesced_io_add, + int128_get64(tmp.start), + int128_get64(tmp.size)); + } +} + static void address_space_update_topology_pass(AddressSpace *as, const FlatView *old_view, const FlatView *new_view, @@ -2136,34 +2163,12 @@ static void memory_region_update_coalesced_range_as= (MemoryRegion *mr, AddressSpa { FlatView *view; FlatRange *fr; - CoalescedMemoryRange *cmr; - AddrRange tmp; - MemoryRegionSection section; =20 view =3D address_space_get_flatview(as); FOR_EACH_FLAT_RANGE(fr, view) { if (fr->mr =3D=3D mr) { - section =3D (MemoryRegionSection) { - .fv =3D view, - .offset_within_address_space =3D int128_get64(fr->addr.sta= rt), - .size =3D fr->addr.size, - }; - - MEMORY_LISTENER_CALL(as, coalesced_io_del, Reverse, §ion, - int128_get64(fr->addr.start), - int128_get64(fr->addr.size)); - QTAILQ_FOREACH(cmr, &mr->coalesced, link) { - tmp =3D addrrange_shift(cmr->addr, - int128_sub(fr->addr.start, - int128_make64(fr->offset_= in_region))); - if (!addrrange_intersects(tmp, fr->addr)) { - continue; - } - tmp =3D addrrange_intersection(tmp, fr->addr); - MEMORY_LISTENER_CALL(as, coalesced_io_add, Forward, §i= on, - int128_get64(tmp.start), - int128_get64(tmp.size)); - } + flat_range_coalesced_io_del(fr, as); + flat_range_coalesced_io_add(fr, as); } } flatview_unref(view); --=20 1.8.3.1