From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:ad09:0:0:0:0:0 with SMTP id t9csp4643522lfc; Tue, 1 Sep 2020 07:34:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuUNaSjcNZm92Pb/drBbQvBnrFdMB3fLwyMbAy5evTGwstsBlPLXM6n7qHTGvADsIPCvS9 X-Received: by 2002:a67:3108:: with SMTP id x8mr1492535vsx.96.1598970842682; Tue, 01 Sep 2020 07:34:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598970842; cv=none; d=google.com; s=arc-20160816; b=Ly8Yy5BasfrazhodyvVXH7Jmgq5v08L4lyGNs96odoFJqS0cZZG65NqAAkdAFkxIug CodhRnAnR+KUcKCi2e+PcJSSsBtrQvnJSQTzHeWpEyjKoYvU5KC0VfffwoRuWmhbdB3D 5HEmYiOxi9/qC/cPAmaMOXRv/fPAVVdjRpXrfrt6ZZGZkjnX02C0vxerELcNa32BI3z6 SJTDl34NPuJyqHE9FN4SNggDk1sns+3XJC9zi9CvwDolKEWmJxo84JuWIsitRlyHakQk UPdint+FxuZE8/lGEd7oNzg0B64vaPo4rdYgW0bOb7eAquUVIDIgs2PlVPrrrgqewafY RzDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=YqwEOZh9pg3KL4mXVkYiZj4zgaY7qsVslSgXGMejPIA=; b=uNdIeYXoK41MDp6z4ZODvhIX76exHe4cWzZZBZCnpsQ6udI8r9IiU+ktcg/VlTTzcE NaVwIybLMDMuDJEkv/92km0OpMEMxB1E1FzVeahUzInytSecxtAHG04XwLm0JYhchSBj 9tvXgTOx5tB86Y8RtqRi76WFObv29j+eHauF58YRrZNFkAXhiNhkNwkc1l+PWmSvtT2I pfXQyjG6oxQ5+j9cUdtWbuk3ujDBvJqLva1BuYT7jyoN0OFtrAObL/005fX/bIZkQeks x5QFaXhVhgV+le0afvqgl81qOhF2fwo8BTbSyH/yJX3tVmeeifMP2mK2i2RokPa6ui/V S2jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Z5zM7tv2; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l11si380399uah.7.2020.09.01.07.34.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Sep 2020 07:34:02 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Z5zM7tv2; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:36220 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7MH-0005Ph-KH for alex.bennee@linaro.org; Tue, 01 Sep 2020 10:34:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD7Fz-0000Qq-MY for qemu-arm@nongnu.org; Tue, 01 Sep 2020 10:27:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD7FC-0005v9-Ni for qemu-arm@nongnu.org; Tue, 01 Sep 2020 10:27:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598970401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YqwEOZh9pg3KL4mXVkYiZj4zgaY7qsVslSgXGMejPIA=; b=Z5zM7tv2hLIkIZP+7PYWZ3bTBDUTWePBEQj5CyZeGgLmozykFQmu01QflQxzap+fl1t6u4 +s+7ad7naB6OIEN4DoPUBbhIJce8IzlIiWhiLEiDcNFLTKFJzIMqtIcgn/9+JfyOIurAV3 /cWAMvTIjtq3Sn1fAZmz2xJQli+jD2o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-486-GetMTGwePlmi2XHchKe_OQ-1; Tue, 01 Sep 2020 10:26:39 -0400 X-MC-Unique: GetMTGwePlmi2XHchKe_OQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A15010ABDA8; Tue, 1 Sep 2020 14:26:37 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-114-76.ams2.redhat.com [10.36.114.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4925E60BE2; Tue, 1 Sep 2020 14:26:30 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: Peter Xu , qemu-devel@nongnu.org Subject: [RFC v8 1/5] memory: Rename memory_region_notify_one to memory_region_notify_iommu_one Date: Tue, 1 Sep 2020 16:26:04 +0200 Message-Id: <20200901142608.24481-2-eperezma@redhat.com> In-Reply-To: <20200901142608.24481-1-eperezma@redhat.com> References: <20200901142608.24481-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=eperezma@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aleksandar Rikalo , Yan Zhao , Eduardo Habkost , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Jason Wang , Juan Quintela , Eric Auger , qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Avi Kivity , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , David Gibson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: 6ZK/hb2DP8lB Previous name didn't reflect the iommu operation. Signed-off-by: Eugenio Pérez --- hw/arm/smmu-common.c | 2 +- hw/arm/smmuv3.c | 2 +- hw/i386/intel_iommu.c | 4 ++-- include/exec/memory.h | 6 +++--- softmmu/memory.c | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 3838db1395..88d2c454f0 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -472,7 +472,7 @@ static void smmu_unmap_notifier_range(IOMMUNotifier *n) entry.perm = IOMMU_NONE; entry.addr_mask = n->end - n->start; - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); } /* Unmap all notifiers attached to @mr */ diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 0122700e72..0a893ae918 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -827,7 +827,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr, entry.addr_mask = num_pages * (1 << granule) - 1; entry.perm = IOMMU_NONE; - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); } /* invalidate an asid/iova range tuple in all mr's */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 5284bb68b6..2ad6b9d796 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3498,7 +3498,7 @@ static void vtd_address_space_unmap(VTDAddressSpace *as, IOMMUNotifier *n) /* This field is meaningless for unmap */ entry.translated_addr = 0; - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); start += mask; remain -= mask; @@ -3536,7 +3536,7 @@ static void vtd_address_space_refresh_all(IntelIOMMUState *s) static int vtd_replay_hook(IOMMUTLBEntry *entry, void *private) { - memory_region_notify_one((IOMMUNotifier *)private, entry); + memory_region_notify_iommu_one((IOMMUNotifier *)private, entry); return 0; } diff --git a/include/exec/memory.h b/include/exec/memory.h index 0cfe987ab4..22c5f564d1 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -226,7 +226,7 @@ enum IOMMUMemoryRegionAttr { * The IOMMU implementation must use the IOMMU notifier infrastructure * to report whenever mappings are changed, by calling * memory_region_notify_iommu() (or, if necessary, by calling - * memory_region_notify_one() for each registered notifier). + * memory_region_notify_iommu_one() for each registered notifier). * * Conceptually an IOMMU provides a mapping from input address * to an output TLB entry. If the IOMMU is aware of memory transaction @@ -1274,7 +1274,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, IOMMUTLBEntry entry); /** - * memory_region_notify_one: notify a change in an IOMMU translation + * memory_region_notify_iommu_one: notify a change in an IOMMU translation * entry to a single notifier * * This works just like memory_region_notify_iommu(), but it only @@ -1285,7 +1285,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, * replaces all old entries for the same virtual I/O address range. * Deleted entries have .@perm == 0. */ -void memory_region_notify_one(IOMMUNotifier *notifier, +void memory_region_notify_iommu_one(IOMMUNotifier *notifier, IOMMUTLBEntry *entry); /** diff --git a/softmmu/memory.c b/softmmu/memory.c index 70b93104e8..961c25b42f 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1890,8 +1890,8 @@ void memory_region_unregister_iommu_notifier(MemoryRegion *mr, memory_region_update_iommu_notify_flags(iommu_mr, NULL); } -void memory_region_notify_one(IOMMUNotifier *notifier, - IOMMUTLBEntry *entry) +void memory_region_notify_iommu_one(IOMMUNotifier *notifier, + IOMMUTLBEntry *entry) { IOMMUNotifierFlag request_flags; hwaddr entry_end = entry->iova + entry->addr_mask; @@ -1927,7 +1927,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, IOMMU_NOTIFIER_FOREACH(iommu_notifier, iommu_mr) { if (iommu_notifier->iommu_idx == iommu_idx) { - memory_region_notify_one(iommu_notifier, &entry); + memory_region_notify_iommu_one(iommu_notifier, &entry); } } } -- 2.18.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4A1CC433E2 for ; Tue, 1 Sep 2020 14:39:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7CE8620767 for ; Tue, 1 Sep 2020 14:39:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Z5zM7tv2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7CE8620767 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD7Rp-00012c-KH for qemu-devel@archiver.kernel.org; Tue, 01 Sep 2020 10:39:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD7Fz-0000Qk-Im for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:27:32 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34160 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD7FC-0005v6-Pv for qemu-devel@nongnu.org; Tue, 01 Sep 2020 10:27:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598970401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YqwEOZh9pg3KL4mXVkYiZj4zgaY7qsVslSgXGMejPIA=; b=Z5zM7tv2hLIkIZP+7PYWZ3bTBDUTWePBEQj5CyZeGgLmozykFQmu01QflQxzap+fl1t6u4 +s+7ad7naB6OIEN4DoPUBbhIJce8IzlIiWhiLEiDcNFLTKFJzIMqtIcgn/9+JfyOIurAV3 /cWAMvTIjtq3Sn1fAZmz2xJQli+jD2o= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-486-GetMTGwePlmi2XHchKe_OQ-1; Tue, 01 Sep 2020 10:26:39 -0400 X-MC-Unique: GetMTGwePlmi2XHchKe_OQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3A15010ABDA8; Tue, 1 Sep 2020 14:26:37 +0000 (UTC) Received: from eperezma.remote.csb (ovpn-114-76.ams2.redhat.com [10.36.114.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4925E60BE2; Tue, 1 Sep 2020 14:26:30 +0000 (UTC) From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: Peter Xu , qemu-devel@nongnu.org Subject: [RFC v8 1/5] memory: Rename memory_region_notify_one to memory_region_notify_iommu_one Date: Tue, 1 Sep 2020 16:26:04 +0200 Message-Id: <20200901142608.24481-2-eperezma@redhat.com> In-Reply-To: <20200901142608.24481-1-eperezma@redhat.com> References: <20200901142608.24481-1-eperezma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eperezma@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.120; envelope-from=eperezma@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 05:11:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aleksandar Rikalo , Yan Zhao , Eduardo Habkost , "Michael S. Tsirkin" , qemu-ppc@nongnu.org, Jason Wang , Juan Quintela , Eric Auger , qemu-arm@nongnu.org, =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Avi Kivity , Paolo Bonzini , Richard Henderson , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Previous name didn't reflect the iommu operation. Signed-off-by: Eugenio Pérez --- hw/arm/smmu-common.c | 2 +- hw/arm/smmuv3.c | 2 +- hw/i386/intel_iommu.c | 4 ++-- include/exec/memory.h | 6 +++--- softmmu/memory.c | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c index 3838db1395..88d2c454f0 100644 --- a/hw/arm/smmu-common.c +++ b/hw/arm/smmu-common.c @@ -472,7 +472,7 @@ static void smmu_unmap_notifier_range(IOMMUNotifier *n) entry.perm = IOMMU_NONE; entry.addr_mask = n->end - n->start; - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); } /* Unmap all notifiers attached to @mr */ diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 0122700e72..0a893ae918 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -827,7 +827,7 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr, entry.addr_mask = num_pages * (1 << granule) - 1; entry.perm = IOMMU_NONE; - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); } /* invalidate an asid/iova range tuple in all mr's */ diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 5284bb68b6..2ad6b9d796 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3498,7 +3498,7 @@ static void vtd_address_space_unmap(VTDAddressSpace *as, IOMMUNotifier *n) /* This field is meaningless for unmap */ entry.translated_addr = 0; - memory_region_notify_one(n, &entry); + memory_region_notify_iommu_one(n, &entry); start += mask; remain -= mask; @@ -3536,7 +3536,7 @@ static void vtd_address_space_refresh_all(IntelIOMMUState *s) static int vtd_replay_hook(IOMMUTLBEntry *entry, void *private) { - memory_region_notify_one((IOMMUNotifier *)private, entry); + memory_region_notify_iommu_one((IOMMUNotifier *)private, entry); return 0; } diff --git a/include/exec/memory.h b/include/exec/memory.h index 0cfe987ab4..22c5f564d1 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -226,7 +226,7 @@ enum IOMMUMemoryRegionAttr { * The IOMMU implementation must use the IOMMU notifier infrastructure * to report whenever mappings are changed, by calling * memory_region_notify_iommu() (or, if necessary, by calling - * memory_region_notify_one() for each registered notifier). + * memory_region_notify_iommu_one() for each registered notifier). * * Conceptually an IOMMU provides a mapping from input address * to an output TLB entry. If the IOMMU is aware of memory transaction @@ -1274,7 +1274,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, IOMMUTLBEntry entry); /** - * memory_region_notify_one: notify a change in an IOMMU translation + * memory_region_notify_iommu_one: notify a change in an IOMMU translation * entry to a single notifier * * This works just like memory_region_notify_iommu(), but it only @@ -1285,7 +1285,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, * replaces all old entries for the same virtual I/O address range. * Deleted entries have .@perm == 0. */ -void memory_region_notify_one(IOMMUNotifier *notifier, +void memory_region_notify_iommu_one(IOMMUNotifier *notifier, IOMMUTLBEntry *entry); /** diff --git a/softmmu/memory.c b/softmmu/memory.c index 70b93104e8..961c25b42f 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1890,8 +1890,8 @@ void memory_region_unregister_iommu_notifier(MemoryRegion *mr, memory_region_update_iommu_notify_flags(iommu_mr, NULL); } -void memory_region_notify_one(IOMMUNotifier *notifier, - IOMMUTLBEntry *entry) +void memory_region_notify_iommu_one(IOMMUNotifier *notifier, + IOMMUTLBEntry *entry) { IOMMUNotifierFlag request_flags; hwaddr entry_end = entry->iova + entry->addr_mask; @@ -1927,7 +1927,7 @@ void memory_region_notify_iommu(IOMMUMemoryRegion *iommu_mr, IOMMU_NOTIFIER_FOREACH(iommu_notifier, iommu_mr) { if (iommu_notifier->iommu_idx == iommu_idx) { - memory_region_notify_one(iommu_notifier, &entry); + memory_region_notify_iommu_one(iommu_notifier, &entry); } } } -- 2.18.1