| Message ID | 1398172475-27873-9-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
>>> On 22.04.14 at 15:14, <julien.grall@linaro.org> wrote: > This function was exported in common header. Rename it and move the > declaration > in drivers/passtrough/vtd/extern.h > > Signed-off-by: Julien Grall <julien.grall@linaro.org> Reviewed-by: Jan Beulich <jbeulich@suse.com> albeit if you need to do another iteration ... > --- 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); ... I'd be happier if you used only one prefix, i.e. vtd_ in this case. Jan
Hi Jan, On 04/22/2014 02:41 PM, Jan Beulich wrote: >>>> On 22.04.14 at 15:14, <julien.grall@linaro.org> wrote: >> This function was exported in common header. Rename it and move the >> declaration >> in drivers/passtrough/vtd/extern.h >> >> Signed-off-by: Julien Grall <julien.grall@linaro.org> > > Reviewed-by: Jan Beulich <jbeulich@suse.com> > > albeit if you need to do another iteration ... I believe I will have to do at least another iteration. I will fix it in my branch just in case. Regards,
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,
This function was exported in common header. Rename it and move the declaration in drivers/passtrough/vtd/extern.h Signed-off-by: Julien Grall <julien.grall@linaro.org> Cc: Xiantao Zhang <xiantao.zhang@intel.com> Cc: Jan Beulich <jbeulich@suse.com> --- 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(-)