Re: [Xen-devel] [PATCH 1/4] AMD/IOMMU: Move headers to be local

[Jan Beulich <jbeulich@xxxxxxxx>]

On 10.02.2020 15:30, Andrew Cooper wrote:
> On 05/02/2020 09:47, Jan Beulich wrote:
>> On 03.02.2020 15:43, Andrew Cooper wrote:
>>> We currently have amd-iommu-defs.h, amd-iommu-proto.h and amd-iommu.h, and 
>>> no
>>> references outside of the AMD IOMMU driver.
>>>
>>> Keep iommu-defs.h as is, but merge amd-iommu.h and amd-iommu-proto.h to just
>>> iommu.h, and move them both into drivers/passthrough/amd/.  (While merging,
>>> drop the bogus #pragma pack around the *_entry structures.)
>>>
>>> Take the opportunity to trim the include lists, including x86/mm/p2m.c
>> I guess you mean p2m.h here.
> 
> Why?
> 
>> diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
>> index def13f657b..fd9f09536d 100644
>> --- a/xen/arch/x86/mm/p2m.c
>> +++ b/xen/arch/x86/mm/p2m.c
>> @@ -38,7 +38,6 @@
>>  #include <asm/mem_sharing.h>
>>  #include <asm/hvm/nestedhvm.h>
>>  #include <asm/altp2m.h>
>> -#include <asm/hvm/svm/amd-iommu-proto.h>
>>  #include <asm/vm_event.h>
>>  #include <xsm/xsm.h>
>>  
> 
> I really do mean p2m.c

Okay, I misunderstood then. I've been judging from

>--- a/xen/drivers/passthrough/amd/iommu_map.c
>+++ b/xen/drivers/passthrough/amd/iommu_map.c
>@@ -18,12 +18,8 @@
>  */
> 
> #include <xen/acpi.h>
>-#include <xen/sched.h>
>-#include <asm/p2m.h>
>-#include <asm/amd-iommu.h>
>-#include <asm/hvm/svm/amd-iommu-proto.h>
>-#include "../ats.h"
>-#include <xen/pci.h>
>+
>+#include "iommu.h"

where you _also_ (re)move p2m.h.

Jan

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel