Re: [RFC kvmtool 9/9] arm64: Get rid of the 'arm-common' include directory

[Alexandru Elisei <alexandru.elisei@arm.com>]

Hi Oliver,

On Fri, Mar 14, 2025 at 03:25:16PM -0700, Oliver Upton wrote:
> Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
> ---
>  arm64/arm-cpu.c                        | 4 ++--
>  arm64/fdt.c                            | 4 ++--
>  arm64/gic.c                            | 2 +-
>  arm64/gicv2m.c                         | 2 +-
>  arm64/include/{arm-common => }/gic.h   | 0
>  arm64/include/kvm/kvm-arch.h           | 2 +-
>  arm64/include/{arm-common => }/pci.h   | 0
>  arm64/include/{arm-common => }/timer.h | 0

Looking at x86 and riscv, the pattern is to have the header files in
<arch>/include/kvm, even if they're only used by the arch code.

Do we care about following this pattern?

Thanks,
Alex

>  arm64/kvm.c                            | 2 +-
>  arm64/pci.c                            | 4 ++--
>  arm64/pmu.c                            | 2 +-
>  arm64/timer.c                          | 4 ++--
>  12 files changed, 13 insertions(+), 13 deletions(-)
>  rename arm64/include/{arm-common => }/gic.h (100%)
>  rename arm64/include/{arm-common => }/pci.h (100%)
>  rename arm64/include/{arm-common => }/timer.h (100%)
> 
> diff --git a/arm64/arm-cpu.c b/arm64/arm-cpu.c
> index f5c8e1e..b9ca814 100644
> --- a/arm64/arm-cpu.c
> +++ b/arm64/arm-cpu.c
> @@ -3,8 +3,8 @@
>  #include "kvm/kvm-cpu.h"
>  #include "kvm/util.h"
>  
> -#include "arm-common/gic.h"
> -#include "arm-common/timer.h"
> +#include "gic.h"
> +#include "timer.h"
>  
>  #include "asm/pmu.h"
>  
> diff --git a/arm64/fdt.c b/arm64/fdt.c
> index 286ccad..9d93551 100644
> --- a/arm64/fdt.c
> +++ b/arm64/fdt.c
> @@ -4,8 +4,8 @@
>  #include "kvm/kvm-cpu.h"
>  #include "kvm/virtio-mmio.h"
>  
> -#include "arm-common/gic.h"
> -#include "arm-common/pci.h"
> +#include "gic.h"
> +#include "pci.h"
>  
>  #include <stdbool.h>
>  
> diff --git a/arm64/gic.c b/arm64/gic.c
> index 0795e95..d0d8543 100644
> --- a/arm64/gic.c
> +++ b/arm64/gic.c
> @@ -3,7 +3,7 @@
>  #include "kvm/kvm.h"
>  #include "kvm/virtio.h"
>  
> -#include "arm-common/gic.h"
> +#include "gic.h"
>  
>  #include <linux/byteorder.h>
>  #include <linux/kernel.h>
> diff --git a/arm64/gicv2m.c b/arm64/gicv2m.c
> index b47ada8..e4e7dc8 100644
> --- a/arm64/gicv2m.c
> +++ b/arm64/gicv2m.c
> @@ -5,7 +5,7 @@
>  #include "kvm/kvm.h"
>  #include "kvm/util.h"
>  
> -#include "arm-common/gic.h"
> +#include "gic.h"
>  
>  #define GICV2M_MSI_TYPER	0x008
>  #define GICV2M_MSI_SETSPI	0x040
> diff --git a/arm64/include/arm-common/gic.h b/arm64/include/gic.h
> similarity index 100%
> rename from arm64/include/arm-common/gic.h
> rename to arm64/include/gic.h
> diff --git a/arm64/include/kvm/kvm-arch.h b/arm64/include/kvm/kvm-arch.h
> index b55b3bf..a9872a8 100644
> --- a/arm64/include/kvm/kvm-arch.h
> +++ b/arm64/include/kvm/kvm-arch.h
> @@ -10,7 +10,7 @@
>  #include <linux/const.h>
>  #include <linux/types.h>
>  
> -#include "arm-common/gic.h"
> +#include "gic.h"
>  
>  /*
>   * The memory map used for ARM guests (not to scale):
> diff --git a/arm64/include/arm-common/pci.h b/arm64/include/pci.h
> similarity index 100%
> rename from arm64/include/arm-common/pci.h
> rename to arm64/include/pci.h
> diff --git a/arm64/include/arm-common/timer.h b/arm64/include/timer.h
> similarity index 100%
> rename from arm64/include/arm-common/timer.h
> rename to arm64/include/timer.h
> diff --git a/arm64/kvm.c b/arm64/kvm.c
> index 5e7fe77..6ee4c1d 100644
> --- a/arm64/kvm.c
> +++ b/arm64/kvm.c
> @@ -5,7 +5,7 @@
>  #include "kvm/virtio-console.h"
>  #include "kvm/fdt.h"
>  
> -#include "arm-common/gic.h"
> +#include "gic.h"
>  
>  #include <linux/byteorder.h>
>  #include <linux/cpumask.h>
> diff --git a/arm64/pci.c b/arm64/pci.c
> index 5bd82d4..99bf887 100644
> --- a/arm64/pci.c
> +++ b/arm64/pci.c
> @@ -5,8 +5,8 @@
>  #include "kvm/pci.h"
>  #include "kvm/util.h"
>  
> -#include "arm-common/pci.h"
> -#include "arm-common/gic.h"
> +#include "pci.h"
> +#include "gic.h"
>  
>  /*
>   * An entry in the interrupt-map table looks like:
> diff --git a/arm64/pmu.c b/arm64/pmu.c
> index 5ed4979..52f4256 100644
> --- a/arm64/pmu.c
> +++ b/arm64/pmu.c
> @@ -9,7 +9,7 @@
>  #include "kvm/kvm-cpu.h"
>  #include "kvm/util.h"
>  
> -#include "arm-common/gic.h"
> +#include "gic.h"
>  
>  #include "asm/pmu.h"
>  
> diff --git a/arm64/timer.c b/arm64/timer.c
> index 6acc50e..b3164f8 100644
> --- a/arm64/timer.c
> +++ b/arm64/timer.c
> @@ -3,8 +3,8 @@
>  #include "kvm/kvm-cpu.h"
>  #include "kvm/util.h"
>  
> -#include "arm-common/gic.h"
> -#include "arm-common/timer.h"
> +#include "gic.h"
> +#include "timer.h"
>  
>  void timer__generate_fdt_nodes(void *fdt, struct kvm *kvm, int *irqs)
>  {
> -- 
> 2.39.5
> 
>