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

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Oliver Upton <oliver.upton@linux.dev>
To: kvmarm@lists.linux.dev
Cc: kvm@vger.kernel.org, Will Deacon <will@kernel.org>,
	Julien Thierry <julien.thierry.kdev@gmail.com>,
	Marc Zyngier <maz@kernel.org>,
	Alexandru Elisei <alexandru.elisei@arm.com>,
	Andre Przywara <andre.przywara@arm.com>,
	Oliver Upton <oliver.upton@linux.dev>
Subject: [PATCH kvmtool 9/9] arm64: Get rid of the 'arm-common' include directory
Date: Tue, 25 Mar 2025 14:39:39 -0700	[thread overview]
Message-ID: <20250325213939.2414498-10-oliver.upton@linux.dev> (raw)
In-Reply-To: <20250325213939.2414498-1-oliver.upton@linux.dev>

Acked-by: Marc Zyngier <maz@kernel.org>
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
 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 b097186..ef3a701 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 11c7a16..7d49cb4 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

next prev parent reply	other threads:[~2025-03-25 21:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-25 21:39 [PATCH kvmtool 0/9] arm: Drop support for 32-bit kvmtool Oliver Upton
2025-03-25 21:39 ` [PATCH kvmtool 1/9] Drop support for 32-bit arm Oliver Upton
2025-03-25 21:39 ` [PATCH kvmtool 2/9] arm64: Move arm64-only features into main directory Oliver Upton
2025-03-25 21:39 ` [PATCH kvmtool 3/9] arm64: Combine kvm.c Oliver Upton
2025-03-25 21:39 ` [PATCH kvmtool 4/9] arm64: Merge kvm-cpu.c Oliver Upton
2025-03-25 21:39 ` [PATCH kvmtool 5/9] arm64: Combine kvm-config-arch.h Oliver Upton
2025-03-25 21:39 ` [PATCH kvmtool 6/9] arm64: Move remaining kvm/* headers Oliver Upton
2025-03-25 21:39 ` [PATCH kvmtool 7/9] arm64: Move asm headers Oliver Upton
2025-03-25 21:39 ` [PATCH kvmtool 8/9] arm64: Rename top-level directory Oliver Upton
2025-03-25 21:39 ` Oliver Upton [this message]
2025-03-27 16:32 ` [PATCH kvmtool 0/9] arm: Drop support for 32-bit kvmtool Alexandru Elisei

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:f5c8e1e dfblob:b9ca814 dfblob:286ccad dfblob:9d93551
dfblob:0795e95 dfblob:d0d8543 dfblob:b47ada8 dfblob:e4e7dc8
dfblob:b097186 dfblob:ef3a701 dfblob:11c7a16 dfblob:7d49cb4
dfblob:5bd82d4 dfblob:99bf887 dfblob:5ed4979 dfblob:52f4256
dfblob:6acc50e dfblob:b3164f8 )
 OR (
bs:"[PATCH kvmtool 9/9] arm64: Get rid of the 'arm-common' include directory" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250325213939.2414498-10-oliver.upton@linux.dev \
    --to=oliver.upton@linux.dev \
    --cc=alexandru.elisei@arm.com \
    --cc=andre.przywara@arm.com \
    --cc=julien.thierry.kdev@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.linux.dev \
    --cc=maz@kernel.org \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.