Re: [Xen-devel] [RFC for-4.5 08/12] xen/passthrough: iommu: Split generic IOMMU code

[Julien Grall <julien.grall@xxxxxxxxxx>]

Hi Ian,

On 02/19/2014 12:39 PM, Ian Campbell wrote:
> On Fri, 2014-02-07 at 17:43 +0000, Julien Grall wrote:
>> The generic IOMMU framework code (xen/drivers/passthrough/iommu.c) contains
>> functions specific to x86 and PCI.
>>
>> Split the framework in 3 distincts files:
>>     - iommu.c: contains generic functions shared between x86 and ARM
>>                (when it will be supported)
>>     - iommu_pci.c: contains specific functions for PCI passthrough
>>     - iommu_x86.c: contains specific functions for x86
>>
>> iommu_pci.c will be only compiled when PCI is supported by the architecture
>> (eg. HAS_PCI is defined).
>>
>> This patch is mostly code movement in new files.
>>
>> Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
>> Cc: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
>> Cc: Jan Beulich <jbeulich@xxxxxxxx>
>> ---
>>  xen/drivers/passthrough/Makefile    |    6 +-
>>  xen/drivers/passthrough/iommu.c     |  473 
>> +----------------------------------
>>  xen/drivers/passthrough/iommu_pci.c |  468 
>> ++++++++++++++++++++++++++++++++++
>>  xen/drivers/passthrough/iommu_x86.c |   65 +++++
>>  xen/drivers/passthrough/vtd/iommu.c |   42 ++--
>>  xen/include/asm-x86/iommu.h         |   46 ++++
>>  xen/include/xen/hvm/iommu.h         |    1 +
>>  xen/include/xen/iommu.h             |   42 ++--
>>  8 files changed, 625 insertions(+), 518 deletions(-)
>>  create mode 100644 xen/drivers/passthrough/iommu_pci.c
>>  create mode 100644 xen/drivers/passthrough/iommu_x86.c
>>  create mode 100644 xen/include/asm-x86/iommu.h
>>
>> diff --git a/xen/drivers/passthrough/Makefile 
>> b/xen/drivers/passthrough/Makefile
>> index 7c40fa5..51e0a0d 100644
>> --- a/xen/drivers/passthrough/Makefile
>> +++ b/xen/drivers/passthrough/Makefile
>> @@ -3,5 +3,7 @@ subdir-$(x86) += amd
>>  subdir-$(x86_64) += x86
>>  
>>  obj-y += iommu.o
>> -obj-y += io.o
>> -obj-y += pci.o
>> +obj-$(x86) += iommu_x86.o
>> +obj-$(HAS_PCI) += iommu_pci.o
>> +obj-$(x86) += io.o
> 
> io.[co] not mentioned in the description?

Right, I will udpate the commit message.

Cheers,

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel