From patchwork Thu Apr 27 09:34:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 755915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wDBdb1HcRz9s8S for ; Thu, 27 Apr 2017 19:35:47 +1000 (AEST) Received: from localhost ([::1]:59626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3fpw-0003Zg-B4 for incoming@patchwork.ozlabs.org; Thu, 27 Apr 2017 05:35:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47367) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3fpI-0003Pv-Ml for qemu-devel@nongnu.org; Thu, 27 Apr 2017 05:35:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3fpH-00040D-Mk for qemu-devel@nongnu.org; Thu, 27 Apr 2017 05:35:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3fpH-0003zc-DW for qemu-devel@nongnu.org; Thu, 27 Apr 2017 05:35:03 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 59E729D409; Thu, 27 Apr 2017 09:35:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 59E729D409 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=peterx@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 59E729D409 Received: from pxdev.xzpeter.org.com (ovpn-8-65.pek2.redhat.com [10.72.8.65]) by smtp.corp.redhat.com (Postfix) with ESMTP id DBA7577E37; Thu, 27 Apr 2017 09:34:56 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 27 Apr 2017 17:34:15 +0800 Message-Id: <1493285660-4470-4-git-send-email-peterx@redhat.com> In-Reply-To: <1493285660-4470-1-git-send-email-peterx@redhat.com> References: <1493285660-4470-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 27 Apr 2017 09:35:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 3/8] memory: rename iommu_notifier_init() 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: tianyu.lan@intel.com, kevin.tian@intel.com, yi.l.liu@intel.com, Jason Wang , peterx@redhat.com, Alex Williamson , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It's new name is iommu_mr_notifier_init(). Again, literal changes only. Signed-off-by: Peter Xu Signed-off-by: David Gibson --- hw/vfio/common.c | 8 ++++---- hw/virtio/vhost.c | 8 ++++---- include/exec/memory.h | 7 ++++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index bd113b7..6b3953b 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -481,10 +481,10 @@ static void vfio_listener_region_add(MemoryListener *listener, llend = int128_add(int128_make64(section->offset_within_region), section->size); llend = int128_sub(llend, int128_one()); - iommu_notifier_init(&giommu->n, vfio_iommu_map_notify, - IOMMU_MR_EVENT_ALL, - section->offset_within_region, - int128_get64(llend)); + iommu_mr_notifier_init(&giommu->n, vfio_iommu_map_notify, + IOMMU_MR_EVENT_ALL, + section->offset_within_region, + int128_get64(llend)); QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next); memory_region_register_iommu_notifier(giommu->iommu, &giommu->n); diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 81a8aea..7449cf8 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -746,10 +746,10 @@ static void vhost_iommu_region_add(MemoryListener *listener, end = int128_add(int128_make64(section->offset_within_region), section->size); end = int128_sub(end, int128_one()); - iommu_notifier_init(&iommu->n, vhost_iommu_unmap_notify, - IOMMU_MR_EVENT_UNMAP, - section->offset_within_region, - int128_get64(end)); + iommu_mr_notifier_init(&iommu->n, vhost_iommu_unmap_notify, + IOMMU_MR_EVENT_UNMAP, + section->offset_within_region, + int128_get64(end)); iommu->mr = section->mr; iommu->iommu_offset = section->offset_within_address_space - section->offset_within_region; diff --git a/include/exec/memory.h b/include/exec/memory.h index 6be0c02..8d8dcb2 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -93,9 +93,10 @@ struct IOMMUMRNotifier { }; typedef struct IOMMUMRNotifier IOMMUMRNotifier; -static inline void iommu_notifier_init(IOMMUMRNotifier *n, IOMMUNotify fn, - IOMMUMREventFlags flags, - hwaddr start, hwaddr end) +static inline void iommu_mr_notifier_init(IOMMUMRNotifier *n, + IOMMUNotify fn, + IOMMUMREventFlags flags, + hwaddr start, hwaddr end) { n->notify = fn; n->notifier_flags = flags;