From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: [PATCH v4 08/21] xen/passthrough: vtd: iommu_set_hwdom_mapping is VTD specific Date: Tue, 22 Apr 2014 14:14:22 +0100 Message-ID: <1398172475-27873-9-git-send-email-julien.grall@linaro.org> References: <1398172475-27873-1-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WcaXJ-0005sn-5O for xen-devel@lists.xenproject.org; Tue, 22 Apr 2014 13:14:57 +0000 Received: by mail-ee0-f44.google.com with SMTP id e49so4600509eek.17 for ; Tue, 22 Apr 2014 06:14:55 -0700 (PDT) In-Reply-To: <1398172475-27873-1-git-send-email-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: ian.campbell@citrix.com, Julien Grall , tim@xen.org, stefano.stabellini@citrix.com, Jan Beulich , Xiantao Zhang List-Id: xen-devel@lists.xenproject.org This function was exported in common header. Rename it and move the declaration in drivers/passtrough/vtd/extern.h Signed-off-by: Julien Grall Cc: Xiantao Zhang Cc: Jan Beulich --- Changes in v4: - Patch added --- xen/drivers/passthrough/vtd/extern.h | 2 ++ xen/drivers/passthrough/vtd/iommu.c | 2 +- xen/drivers/passthrough/vtd/x86/vtd.c | 2 +- xen/include/xen/iommu.h | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/extern.h b/xen/drivers/passthrough/vtd/extern.h index 14cd90e..823420d 100644 --- a/xen/drivers/passthrough/vtd/extern.h +++ b/xen/drivers/passthrough/vtd/extern.h @@ -103,4 +103,6 @@ void pci_vtd_quirk(struct pci_dev *pdev); int platform_supports_intremap(void); int platform_supports_x2apic(void); +void iommu_vtd_set_hwdom_mapping(struct domain *d); + #endif // _VTD_EXTERN_H_ diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index c94b0d1..081fe97 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -1249,7 +1249,7 @@ static void __hwdom_init intel_iommu_hwdom_init(struct domain *d) if ( !iommu_passthrough && !need_iommu(d) ) { /* Set up 1:1 page table for dom0 */ - iommu_set_hwdom_mapping(d); + iommu_vtd_set_hwdom_mapping(d); } setup_hwdom_pci_devices(d, setup_hwdom_device); diff --git a/xen/drivers/passthrough/vtd/x86/vtd.c b/xen/drivers/passthrough/vtd/x86/vtd.c index 218e223..7196c82 100644 --- a/xen/drivers/passthrough/vtd/x86/vtd.c +++ b/xen/drivers/passthrough/vtd/x86/vtd.c @@ -107,7 +107,7 @@ void hvm_dpci_isairq_eoi(struct domain *d, unsigned int isairq) spin_unlock(&d->event_lock); } -void __hwdom_init iommu_set_hwdom_mapping(struct domain *d) +void __hwdom_init iommu_vtd_set_hwdom_mapping(struct domain *d) { unsigned long i, j, tmp, top; diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index f8da9f2..1fd8fb9 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -127,7 +127,6 @@ void iommu_suspend(void); void iommu_resume(void); void iommu_crash_shutdown(void); -void iommu_set_hwdom_mapping(struct domain *d); void iommu_share_p2m_table(struct domain *d); int iommu_do_domctl(struct xen_domctl *, struct domain *d, -- 1.7.10.4