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

[George Dunlap <george.dunlap@xxxxxxxxxx>]

On 2/3/20 2:43 PM, 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
> which (AFAICT) hasn't needed this include since c/s aef3f2275 "x86/mm/p2m:
> break into common, pt-implementation and pod parts" in 2011.
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> ---
> CC: Jan Beulich <JBeulich@xxxxxxxx>
> CC: Wei Liu <wl@xxxxxxx>
> CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> CC: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
> ---
>  xen/arch/x86/mm/p2m.c                              |   1 -
>  .../passthrough/amd/iommu-defs.h}                  |   6 +-
>  .../passthrough/amd/iommu.h}                       | 179 ++++++++++++++++++-
>  xen/drivers/passthrough/amd/iommu_acpi.c           |   7 +-
>  xen/drivers/passthrough/amd/iommu_cmd.c            |   4 +-
>  xen/drivers/passthrough/amd/iommu_detect.c         |   7 +-
>  xen/drivers/passthrough/amd/iommu_guest.c          |   4 +-
>  xen/drivers/passthrough/amd/iommu_init.c           |  13 +-
>  xen/drivers/passthrough/amd/iommu_intr.c           |   9 +-
>  xen/drivers/passthrough/amd/iommu_map.c            |   8 +-
>  xen/drivers/passthrough/amd/pci_amd_iommu.c        |   9 +-
>  xen/include/asm-x86/amd-iommu.h                    | 190 
> ---------------------
>  12 files changed, 194 insertions(+), 243 deletions(-)
>  rename xen/{include/asm-x86/hvm/svm/amd-iommu-defs.h => 
> drivers/passthrough/amd/iommu-defs.h} (99%)
>  rename xen/{include/asm-x86/hvm/svm/amd-iommu-proto.h => 
> drivers/passthrough/amd/iommu.h} (70%)
>  delete mode 100644 xen/include/asm-x86/amd-iommu.h
> 
> 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>
>  

p2m bits:

Acked-by: George Dunlap <george.dunlap@xxxxxxxxxx>

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