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

[Oliver Upton <oliver.upton@xxxxxxxxx>]

Acked-by: Marc Zyngier <maz@xxxxxxxxxx>
Reviewed-by: Alexandru Elisei <alexandru.elisei@xxxxxxx>
Signed-off-by: Oliver Upton <oliver.upton@xxxxxxxxx>
---
 arm64/arm-cpu.c                                    | 5 ++---
 arm64/fdt.c                                        | 5 ++---
 arm64/gic.c                                        | 3 +--
 arm64/gicv2m.c                                     | 3 +--
 arm64/include/{arm-common => kvm}/gic.h            | 0
 arm64/include/kvm/kvm-arch.h                       | 2 +-
 arm64/include/{arm-common/pci.h => kvm/pci-arch.h} | 0
 arm64/include/{arm-common => kvm}/timer.h          | 0
 arm64/kvm.c                                        | 3 +--
 arm64/pci.c                                        | 5 ++---
 arm64/pmu.c                                        | 3 +--
 arm64/timer.c                                      | 5 ++---
 12 files changed, 13 insertions(+), 21 deletions(-)
 rename arm64/include/{arm-common => kvm}/gic.h (100%)
 rename arm64/include/{arm-common/pci.h => kvm/pci-arch.h} (100%)
 rename arm64/include/{arm-common => kvm}/timer.h (100%)

diff --git a/arm64/arm-cpu.c b/arm64/arm-cpu.c
index f5c8e1e..69bb2cb 100644
--- a/arm64/arm-cpu.c
+++ b/arm64/arm-cpu.c
@@ -1,11 +1,10 @@
 #include "kvm/fdt.h"
+#include "kvm/gic.h"
 #include "kvm/kvm.h"
 #include "kvm/kvm-cpu.h"
+#include "kvm/timer.h"
 #include "kvm/util.h"
 
-#include "arm-common/gic.h"
-#include "arm-common/timer.h"
-
 #include "asm/pmu.h"
 
 #include <linux/byteorder.h>
diff --git a/arm64/fdt.c b/arm64/fdt.c
index 286ccad..df77758 100644
--- a/arm64/fdt.c
+++ b/arm64/fdt.c
@@ -1,12 +1,11 @@
 #include "kvm/devices.h"
 #include "kvm/fdt.h"
+#include "kvm/gic.h"
 #include "kvm/kvm.h"
 #include "kvm/kvm-cpu.h"
+#include "kvm/pci-arch.h"
 #include "kvm/virtio-mmio.h"
 
-#include "arm-common/gic.h"
-#include "arm-common/pci.h"
-
 #include <stdbool.h>
 
 #include <linux/byteorder.h>
diff --git a/arm64/gic.c b/arm64/gic.c
index 0795e95..b0d3a1a 100644
--- a/arm64/gic.c
+++ b/arm64/gic.c
@@ -1,10 +1,9 @@
 #include "kvm/fdt.h"
+#include "kvm/gic.h"
 #include "kvm/irq.h"
 #include "kvm/kvm.h"
 #include "kvm/virtio.h"
 
-#include "arm-common/gic.h"
-
 #include <linux/byteorder.h>
 #include <linux/kernel.h>
 #include <linux/kvm.h>
diff --git a/arm64/gicv2m.c b/arm64/gicv2m.c
index b47ada8..b3c542a 100644
--- a/arm64/gicv2m.c
+++ b/arm64/gicv2m.c
@@ -2,11 +2,10 @@
 #include <stdlib.h>
 
 #include "kvm/irq.h"
+#include "kvm/gic.h"
 #include "kvm/kvm.h"
 #include "kvm/util.h"
 
-#include "arm-common/gic.h"
-
 #define GICV2M_MSI_TYPER	0x008
 #define GICV2M_MSI_SETSPI	0x040
 #define GICV2M_MSI_IIDR		0xfcc
diff --git a/arm64/include/arm-common/gic.h b/arm64/include/kvm/gic.h
similarity index 100%
rename from arm64/include/arm-common/gic.h
rename to arm64/include/kvm/gic.h
diff --git a/arm64/include/kvm/kvm-arch.h b/arm64/include/kvm/kvm-arch.h
index b097186..8f508ef 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 "kvm/gic.h"
 
 /*
  * The memory map used for ARM guests (not to scale):
diff --git a/arm64/include/arm-common/pci.h b/arm64/include/kvm/pci-arch.h
similarity index 100%
rename from arm64/include/arm-common/pci.h
rename to arm64/include/kvm/pci-arch.h
diff --git a/arm64/include/arm-common/timer.h b/arm64/include/kvm/timer.h
similarity index 100%
rename from arm64/include/arm-common/timer.h
rename to arm64/include/kvm/timer.h
diff --git a/arm64/kvm.c b/arm64/kvm.c
index 11c7a16..23b4dab 100644
--- a/arm64/kvm.c
+++ b/arm64/kvm.c
@@ -4,8 +4,7 @@
 #include "kvm/8250-serial.h"
 #include "kvm/virtio-console.h"
 #include "kvm/fdt.h"
-
-#include "arm-common/gic.h"
+#include "kvm/gic.h"
 
 #include <linux/byteorder.h>
 #include <linux/cpumask.h>
diff --git a/arm64/pci.c b/arm64/pci.c
index 5bd82d4..0366783 100644
--- a/arm64/pci.c
+++ b/arm64/pci.c
@@ -1,13 +1,12 @@
 #include "kvm/devices.h"
 #include "kvm/fdt.h"
+#include "kvm/gic.h"
 #include "kvm/kvm.h"
 #include "kvm/of_pci.h"
 #include "kvm/pci.h"
+#include "kvm/pci-arch.h"
 #include "kvm/util.h"
 
-#include "arm-common/pci.h"
-#include "arm-common/gic.h"
-
 /*
  * An entry in the interrupt-map table looks like:
  * <pci unit address> <pci interrupt pin> <gic phandle> <gic interrupt>
diff --git a/arm64/pmu.c b/arm64/pmu.c
index 5ed4979..5f31d6b 100644
--- a/arm64/pmu.c
+++ b/arm64/pmu.c
@@ -5,12 +5,11 @@
 #include "linux/err.h"
 
 #include "kvm/fdt.h"
+#include "kvm/gic.h"
 #include "kvm/kvm.h"
 #include "kvm/kvm-cpu.h"
 #include "kvm/util.h"
 
-#include "arm-common/gic.h"
-
 #include "asm/pmu.h"
 
 static bool pmu_has_attr(struct kvm_cpu *vcpu, u64 attr)
diff --git a/arm64/timer.c b/arm64/timer.c
index 6acc50e..861f2d9 100644
--- a/arm64/timer.c
+++ b/arm64/timer.c
@@ -1,11 +1,10 @@
 #include "kvm/fdt.h"
+#include "kvm/gic.h"
 #include "kvm/kvm.h"
 #include "kvm/kvm-cpu.h"
+#include "kvm/timer.h"
 #include "kvm/util.h"
 
-#include "arm-common/gic.h"
-#include "arm-common/timer.h"
-
 void timer__generate_fdt_nodes(void *fdt, struct kvm *kvm, int *irqs)
 {
 	const char compatible[] = "arm,armv8-timer\0arm,armv7-timer";
-- 
2.39.5