1. Patchew
  2. linux
  3. [PATCH 0/8] KVM: Remove include/kvm, standardize includes
  4. View patch

[PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h

Sean Christopherson posted 8 patches 4 months ago
[PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h
Posted by Sean Christopherson 4 months ago 
Move iodev.h, the last remaining holdout in include/kvm, to the standard
include/linux directory as kvm_iodev.h and delete include/kvm.

Acked-by: Anup Patel <anup@brainfault.org>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 MAINTAINERS                                | 1 -
 arch/arm64/include/asm/kvm_vgic.h          | 2 +-
 arch/arm64/kvm/vgic/vgic-mmio-v2.c         | 2 +-
 arch/arm64/kvm/vgic/vgic-mmio-v3.c         | 2 +-
 arch/arm64/kvm/vgic/vgic-mmio.c            | 2 +-
 arch/loongarch/include/asm/kvm_eiointc.h   | 2 +-
 arch/loongarch/include/asm/kvm_ipi.h       | 2 +-
 arch/loongarch/include/asm/kvm_pch_pic.h   | 2 +-
 arch/mips/include/asm/kvm_host.h           | 3 +--
 arch/powerpc/kvm/mpic.c                    | 2 +-
 arch/riscv/kvm/aia_aplic.c                 | 2 +-
 arch/riscv/kvm/aia_imsic.c                 | 2 +-
 arch/x86/kvm/i8254.h                       | 2 +-
 arch/x86/kvm/ioapic.h                      | 2 +-
 arch/x86/kvm/irq.h                         | 2 +-
 arch/x86/kvm/lapic.h                       | 2 +-
 include/{kvm/iodev.h => linux/kvm_iodev.h} | 0
 virt/kvm/coalesced_mmio.c                  | 3 +--
 virt/kvm/eventfd.c                         | 2 +-
 virt/kvm/kvm_main.c                        | 3 +--
 20 files changed, 18 insertions(+), 22 deletions(-)
 rename include/{kvm/iodev.h => linux/kvm_iodev.h} (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index 10cf54c8f727..a2cd432273e5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -13011,7 +13011,6 @@ W:	http://www.linux-kvm.org
 T:	git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
 F:	Documentation/virt/kvm/
 F:	include/asm-generic/kvm*
-F:	include/kvm/iodev.h
 F:	include/linux/kvm*
 F:	include/trace/events/kvm.h
 F:	include/uapi/asm-generic/kvm*
diff --git a/arch/arm64/include/asm/kvm_vgic.h b/arch/arm64/include/asm/kvm_vgic.h
index 4a34f7f0a864..09d7f628fa3b 100644
--- a/arch/arm64/include/asm/kvm_vgic.h
+++ b/arch/arm64/include/asm/kvm_vgic.h
@@ -14,7 +14,7 @@
 #include <linux/static_key.h>
 #include <linux/types.h>
 #include <linux/xarray.h>
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 #include <linux/list.h>
 #include <linux/jump_label.h>
 
diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
index d00c8a74fad6..889440a8b129 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
@@ -6,9 +6,9 @@
 #include <linux/irqchip/arm-gic.h>
 #include <linux/kvm.h>
 #include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
 #include <linux/nospec.h>
 
-#include <kvm/iodev.h>
 #include <asm/kvm_vgic.h>
 
 #include "vgic.h"
diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
index 505d4e389885..db95d3ccbd14 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
@@ -7,8 +7,8 @@
 #include <linux/irqchip/arm-gic-v3.h>
 #include <linux/kvm.h>
 #include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
 #include <linux/interrupt.h>
-#include <kvm/iodev.h>
 
 #include <asm/kvm_emulate.h>
 #include <asm/kvm_arm.h>
diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c
index ec1b13abc728..de689e0e881f 100644
--- a/arch/arm64/kvm/vgic/vgic-mmio.c
+++ b/arch/arm64/kvm/vgic/vgic-mmio.c
@@ -9,7 +9,7 @@
 #include <linux/irq.h>
 #include <linux/kvm.h>
 #include <linux/kvm_host.h>
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 #include <asm/kvm_arch_timer.h>
 #include <asm/kvm_vgic.h>
 
diff --git a/arch/loongarch/include/asm/kvm_eiointc.h b/arch/loongarch/include/asm/kvm_eiointc.h
index a3a40aba8acf..0049b0b79477 100644
--- a/arch/loongarch/include/asm/kvm_eiointc.h
+++ b/arch/loongarch/include/asm/kvm_eiointc.h
@@ -6,7 +6,7 @@
 #ifndef __ASM_KVM_EIOINTC_H
 #define __ASM_KVM_EIOINTC_H
 
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 
 #define EIOINTC_IRQS			256
 #define EIOINTC_ROUTE_MAX_VCPUS		256
diff --git a/arch/loongarch/include/asm/kvm_ipi.h b/arch/loongarch/include/asm/kvm_ipi.h
index 060163dfb4a3..3956b230f087 100644
--- a/arch/loongarch/include/asm/kvm_ipi.h
+++ b/arch/loongarch/include/asm/kvm_ipi.h
@@ -6,7 +6,7 @@
 #ifndef __ASM_KVM_IPI_H
 #define __ASM_KVM_IPI_H
 
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 
 #define LARCH_INT_IPI			12
 
diff --git a/arch/loongarch/include/asm/kvm_pch_pic.h b/arch/loongarch/include/asm/kvm_pch_pic.h
index e6df6a4c1c70..4b37e3134e52 100644
--- a/arch/loongarch/include/asm/kvm_pch_pic.h
+++ b/arch/loongarch/include/asm/kvm_pch_pic.h
@@ -6,7 +6,7 @@
 #ifndef __ASM_KVM_PCH_PIC_H
 #define __ASM_KVM_PCH_PIC_H
 
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 
 #define PCH_PIC_SIZE			0x3e8
 
diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
index c14b10821817..0d7dd89ca5bf 100644
--- a/arch/mips/include/asm/kvm_host.h
+++ b/arch/mips/include/asm/kvm_host.h
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/types.h>
 #include <linux/kvm.h>
+#include <linux/kvm_iodev.h>
 #include <linux/kvm_types.h>
 #include <linux/threads.h>
 #include <linux/spinlock.h>
@@ -24,8 +25,6 @@
 #include <asm/inst.h>
 #include <asm/mipsregs.h>
 
-#include <kvm/iodev.h>
-
 /* MIPS KVM register ids */
 #define MIPS_CP0_32(_R, _S)					\
 	(KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U32 | (8 * (_R) + (_S)))
diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c
index 23e9c2bd9f27..b25a03251544 100644
--- a/arch/powerpc/kvm/mpic.c
+++ b/arch/powerpc/kvm/mpic.c
@@ -26,6 +26,7 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/anon_inodes.h>
@@ -33,7 +34,6 @@
 #include <asm/mpic.h>
 #include <asm/kvm_para.h>
 #include <asm/kvm_ppc.h>
-#include <kvm/iodev.h>
 
 #define MAX_CPU     32
 #define MAX_SRC     256
diff --git a/arch/riscv/kvm/aia_aplic.c b/arch/riscv/kvm/aia_aplic.c
index f59d1c0c8c43..bf163724aec5 100644
--- a/arch/riscv/kvm/aia_aplic.c
+++ b/arch/riscv/kvm/aia_aplic.c
@@ -9,10 +9,10 @@
 
 #include <linux/irqchip/riscv-aplic.h>
 #include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
 #include <linux/math.h>
 #include <linux/spinlock.h>
 #include <linux/swab.h>
-#include <kvm/iodev.h>
 
 struct aplic_irq {
 	raw_spinlock_t lock;
diff --git a/arch/riscv/kvm/aia_imsic.c b/arch/riscv/kvm/aia_imsic.c
index 29ef9c2133a9..ae3c0807baa9 100644
--- a/arch/riscv/kvm/aia_imsic.c
+++ b/arch/riscv/kvm/aia_imsic.c
@@ -11,10 +11,10 @@
 #include <linux/bitmap.h>
 #include <linux/irqchip/riscv-imsic.h>
 #include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
 #include <linux/math.h>
 #include <linux/spinlock.h>
 #include <linux/swab.h>
-#include <kvm/iodev.h>
 #include <asm/csr.h>
 
 #define IMSIC_MAX_EIX	(IMSIC_MAX_ID / BITS_PER_TYPE(u64))
diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
index a768212ba821..4de7a0b88e4f 100644
--- a/arch/x86/kvm/i8254.h
+++ b/arch/x86/kvm/i8254.h
@@ -4,7 +4,7 @@
 
 #include <linux/kthread.h>
 
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 
 struct kvm_kpit_channel_state {
 	u32 count; /* can be 65536 */
diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h
index aa8cb4ac0479..cb36c36affd3 100644
--- a/arch/x86/kvm/ioapic.h
+++ b/arch/x86/kvm/ioapic.h
@@ -3,7 +3,7 @@
 #define __KVM_IO_APIC_H
 
 #include <linux/kvm_host.h>
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 #include "irq.h"
 
 struct kvm;
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index 76d46b2f41dd..b21b03aa2ee7 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -13,9 +13,9 @@
 #include <linux/mm_types.h>
 #include <linux/hrtimer.h>
 #include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
 #include <linux/spinlock.h>
 
-#include <kvm/iodev.h>
 #include "lapic.h"
 
 #define PIC_NUM_PINS 16
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 4ce30db65828..43ffbded5f72 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -2,7 +2,7 @@
 #ifndef __KVM_X86_LAPIC_H
 #define __KVM_X86_LAPIC_H
 
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 
 #include <linux/kvm_host.h>
 
diff --git a/include/kvm/iodev.h b/include/linux/kvm_iodev.h
similarity index 100%
rename from include/kvm/iodev.h
rename to include/linux/kvm_iodev.h
diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
index 375d6285475e..d0f84e3611da 100644
--- a/virt/kvm/coalesced_mmio.c
+++ b/virt/kvm/coalesced_mmio.c
@@ -9,8 +9,7 @@
  *
  */
 
-#include <kvm/iodev.h>
-
+#include <linux/kvm_iodev.h>
 #include <linux/kvm_host.h>
 #include <linux/slab.h>
 #include <linux/kvm.h>
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 11e5d1e3f12e..35786d59b233 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -26,7 +26,7 @@
 #include <linux/irqbypass.h>
 #include <trace/events/kvm.h>
 
-#include <kvm/iodev.h>
+#include <linux/kvm_iodev.h>
 
 #ifdef CONFIG_HAVE_KVM_IRQCHIP
 
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index eec82775c5bf..a401ba32ecaa 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -10,9 +10,8 @@
  *   Yaniv Kamay  <yaniv@qumranet.com>
  */
 
-#include <kvm/iodev.h>
-
 #include <linux/kvm_host.h>
+#include <linux/kvm_iodev.h>
 #include <linux/kvm.h>
 #include <linux/module.h>
 #include <linux/errno.h>
-- 
2.50.0.rc0.642.g800a2b2222-goog
Re: [PATCH 4/8] KVM: Move include/kvm/iodev.h to include/linux as kvm_iodev.h
Posted by Bibo Mao 3 months, 3 weeks ago 

On 2025/6/11 上午8:10, Sean Christopherson wrote:
> Move iodev.h, the last remaining holdout in include/kvm, to the standard
> include/linux directory as kvm_iodev.h and delete include/kvm.
> 
> Acked-by: Anup Patel <anup@brainfault.org>
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> ---
>   MAINTAINERS                                | 1 -
>   arch/arm64/include/asm/kvm_vgic.h          | 2 +-
>   arch/arm64/kvm/vgic/vgic-mmio-v2.c         | 2 +-
>   arch/arm64/kvm/vgic/vgic-mmio-v3.c         | 2 +-
>   arch/arm64/kvm/vgic/vgic-mmio.c            | 2 +-
>   arch/loongarch/include/asm/kvm_eiointc.h   | 2 +-
>   arch/loongarch/include/asm/kvm_ipi.h       | 2 +-
>   arch/loongarch/include/asm/kvm_pch_pic.h   | 2 +-
>   arch/mips/include/asm/kvm_host.h           | 3 +--
>   arch/powerpc/kvm/mpic.c                    | 2 +-
>   arch/riscv/kvm/aia_aplic.c                 | 2 +-
>   arch/riscv/kvm/aia_imsic.c                 | 2 +-
>   arch/x86/kvm/i8254.h                       | 2 +-
>   arch/x86/kvm/ioapic.h                      | 2 +-
>   arch/x86/kvm/irq.h                         | 2 +-
>   arch/x86/kvm/lapic.h                       | 2 +-
>   include/{kvm/iodev.h => linux/kvm_iodev.h} | 0
>   virt/kvm/coalesced_mmio.c                  | 3 +--
>   virt/kvm/eventfd.c                         | 2 +-
>   virt/kvm/kvm_main.c                        | 3 +--
>   20 files changed, 18 insertions(+), 22 deletions(-)
>   rename include/{kvm/iodev.h => linux/kvm_iodev.h} (100%)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 10cf54c8f727..a2cd432273e5 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -13011,7 +13011,6 @@ W:	http://www.linux-kvm.org
>   T:	git git://git.kernel.org/pub/scm/virt/kvm/kvm.git
>   F:	Documentation/virt/kvm/
>   F:	include/asm-generic/kvm*
> -F:	include/kvm/iodev.h
>   F:	include/linux/kvm*
>   F:	include/trace/events/kvm.h
>   F:	include/uapi/asm-generic/kvm*
> diff --git a/arch/arm64/include/asm/kvm_vgic.h b/arch/arm64/include/asm/kvm_vgic.h
> index 4a34f7f0a864..09d7f628fa3b 100644
> --- a/arch/arm64/include/asm/kvm_vgic.h
> +++ b/arch/arm64/include/asm/kvm_vgic.h
> @@ -14,7 +14,7 @@
>   #include <linux/static_key.h>
>   #include <linux/types.h>
>   #include <linux/xarray.h>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/list.h>
>   #include <linux/jump_label.h>
>   
> diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
> index d00c8a74fad6..889440a8b129 100644
> --- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c
> +++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c
> @@ -6,9 +6,9 @@
>   #include <linux/irqchip/arm-gic.h>
>   #include <linux/kvm.h>
>   #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/nospec.h>
>   
> -#include <kvm/iodev.h>
>   #include <asm/kvm_vgic.h>
>   
>   #include "vgic.h"
> diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
> index 505d4e389885..db95d3ccbd14 100644
> --- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c
> +++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c
> @@ -7,8 +7,8 @@
>   #include <linux/irqchip/arm-gic-v3.h>
>   #include <linux/kvm.h>
>   #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/interrupt.h>
> -#include <kvm/iodev.h>
>   
>   #include <asm/kvm_emulate.h>
>   #include <asm/kvm_arm.h>
> diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c
> index ec1b13abc728..de689e0e881f 100644
> --- a/arch/arm64/kvm/vgic/vgic-mmio.c
> +++ b/arch/arm64/kvm/vgic/vgic-mmio.c
> @@ -9,7 +9,7 @@
>   #include <linux/irq.h>
>   #include <linux/kvm.h>
>   #include <linux/kvm_host.h>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   #include <asm/kvm_arch_timer.h>
>   #include <asm/kvm_vgic.h>
>   
> diff --git a/arch/loongarch/include/asm/kvm_eiointc.h b/arch/loongarch/include/asm/kvm_eiointc.h
> index a3a40aba8acf..0049b0b79477 100644
> --- a/arch/loongarch/include/asm/kvm_eiointc.h
> +++ b/arch/loongarch/include/asm/kvm_eiointc.h
> @@ -6,7 +6,7 @@
>   #ifndef __ASM_KVM_EIOINTC_H
>   #define __ASM_KVM_EIOINTC_H
>   
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   
>   #define EIOINTC_IRQS			256
>   #define EIOINTC_ROUTE_MAX_VCPUS		256
> diff --git a/arch/loongarch/include/asm/kvm_ipi.h b/arch/loongarch/include/asm/kvm_ipi.h
> index 060163dfb4a3..3956b230f087 100644
> --- a/arch/loongarch/include/asm/kvm_ipi.h
> +++ b/arch/loongarch/include/asm/kvm_ipi.h
> @@ -6,7 +6,7 @@
>   #ifndef __ASM_KVM_IPI_H
>   #define __ASM_KVM_IPI_H
>   
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   
>   #define LARCH_INT_IPI			12
>   
> diff --git a/arch/loongarch/include/asm/kvm_pch_pic.h b/arch/loongarch/include/asm/kvm_pch_pic.h
> index e6df6a4c1c70..4b37e3134e52 100644
> --- a/arch/loongarch/include/asm/kvm_pch_pic.h
> +++ b/arch/loongarch/include/asm/kvm_pch_pic.h
> @@ -6,7 +6,7 @@
>   #ifndef __ASM_KVM_PCH_PIC_H
>   #define __ASM_KVM_PCH_PIC_H
>   
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   
>   #define PCH_PIC_SIZE			0x3e8
>   
> diff --git a/arch/mips/include/asm/kvm_host.h b/arch/mips/include/asm/kvm_host.h
> index c14b10821817..0d7dd89ca5bf 100644
> --- a/arch/mips/include/asm/kvm_host.h
> +++ b/arch/mips/include/asm/kvm_host.h
> @@ -16,6 +16,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/types.h>
>   #include <linux/kvm.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/kvm_types.h>
>   #include <linux/threads.h>
>   #include <linux/spinlock.h>
> @@ -24,8 +25,6 @@
>   #include <asm/inst.h>
>   #include <asm/mipsregs.h>
>   
> -#include <kvm/iodev.h>
> -
>   /* MIPS KVM register ids */
>   #define MIPS_CP0_32(_R, _S)					\
>   	(KVM_REG_MIPS_CP0 | KVM_REG_SIZE_U32 | (8 * (_R) + (_S)))
> diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c
> index 23e9c2bd9f27..b25a03251544 100644
> --- a/arch/powerpc/kvm/mpic.c
> +++ b/arch/powerpc/kvm/mpic.c
> @@ -26,6 +26,7 @@
>   #include <linux/slab.h>
>   #include <linux/mutex.h>
>   #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/errno.h>
>   #include <linux/fs.h>
>   #include <linux/anon_inodes.h>
> @@ -33,7 +34,6 @@
>   #include <asm/mpic.h>
>   #include <asm/kvm_para.h>
>   #include <asm/kvm_ppc.h>
> -#include <kvm/iodev.h>
>   
>   #define MAX_CPU     32
>   #define MAX_SRC     256
> diff --git a/arch/riscv/kvm/aia_aplic.c b/arch/riscv/kvm/aia_aplic.c
> index f59d1c0c8c43..bf163724aec5 100644
> --- a/arch/riscv/kvm/aia_aplic.c
> +++ b/arch/riscv/kvm/aia_aplic.c
> @@ -9,10 +9,10 @@
>   
>   #include <linux/irqchip/riscv-aplic.h>
>   #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/math.h>
>   #include <linux/spinlock.h>
>   #include <linux/swab.h>
> -#include <kvm/iodev.h>
>   
>   struct aplic_irq {
>   	raw_spinlock_t lock;
> diff --git a/arch/riscv/kvm/aia_imsic.c b/arch/riscv/kvm/aia_imsic.c
> index 29ef9c2133a9..ae3c0807baa9 100644
> --- a/arch/riscv/kvm/aia_imsic.c
> +++ b/arch/riscv/kvm/aia_imsic.c
> @@ -11,10 +11,10 @@
>   #include <linux/bitmap.h>
>   #include <linux/irqchip/riscv-imsic.h>
>   #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/math.h>
>   #include <linux/spinlock.h>
>   #include <linux/swab.h>
> -#include <kvm/iodev.h>
>   #include <asm/csr.h>
>   
>   #define IMSIC_MAX_EIX	(IMSIC_MAX_ID / BITS_PER_TYPE(u64))
> diff --git a/arch/x86/kvm/i8254.h b/arch/x86/kvm/i8254.h
> index a768212ba821..4de7a0b88e4f 100644
> --- a/arch/x86/kvm/i8254.h
> +++ b/arch/x86/kvm/i8254.h
> @@ -4,7 +4,7 @@
>   
>   #include <linux/kthread.h>
>   
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   
>   struct kvm_kpit_channel_state {
>   	u32 count; /* can be 65536 */
> diff --git a/arch/x86/kvm/ioapic.h b/arch/x86/kvm/ioapic.h
> index aa8cb4ac0479..cb36c36affd3 100644
> --- a/arch/x86/kvm/ioapic.h
> +++ b/arch/x86/kvm/ioapic.h
> @@ -3,7 +3,7 @@
>   #define __KVM_IO_APIC_H
>   
>   #include <linux/kvm_host.h>
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   #include "irq.h"
>   
>   struct kvm;
> diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
> index 76d46b2f41dd..b21b03aa2ee7 100644
> --- a/arch/x86/kvm/irq.h
> +++ b/arch/x86/kvm/irq.h
> @@ -13,9 +13,9 @@
>   #include <linux/mm_types.h>
>   #include <linux/hrtimer.h>
>   #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/spinlock.h>
>   
> -#include <kvm/iodev.h>
>   #include "lapic.h"
>   
>   #define PIC_NUM_PINS 16
> diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
> index 4ce30db65828..43ffbded5f72 100644
> --- a/arch/x86/kvm/lapic.h
> +++ b/arch/x86/kvm/lapic.h
> @@ -2,7 +2,7 @@
>   #ifndef __KVM_X86_LAPIC_H
>   #define __KVM_X86_LAPIC_H
>   
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   
>   #include <linux/kvm_host.h>
>   
> diff --git a/include/kvm/iodev.h b/include/linux/kvm_iodev.h
> similarity index 100%
> rename from include/kvm/iodev.h
> rename to include/linux/kvm_iodev.h
> diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
> index 375d6285475e..d0f84e3611da 100644
> --- a/virt/kvm/coalesced_mmio.c
> +++ b/virt/kvm/coalesced_mmio.c
> @@ -9,8 +9,7 @@
>    *
>    */
>   
> -#include <kvm/iodev.h>
> -
> +#include <linux/kvm_iodev.h>
>   #include <linux/kvm_host.h>
>   #include <linux/slab.h>
>   #include <linux/kvm.h>
> diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
> index 11e5d1e3f12e..35786d59b233 100644
> --- a/virt/kvm/eventfd.c
> +++ b/virt/kvm/eventfd.c
> @@ -26,7 +26,7 @@
>   #include <linux/irqbypass.h>
>   #include <trace/events/kvm.h>
>   
> -#include <kvm/iodev.h>
> +#include <linux/kvm_iodev.h>
>   
>   #ifdef CONFIG_HAVE_KVM_IRQCHIP
>   
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index eec82775c5bf..a401ba32ecaa 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -10,9 +10,8 @@
>    *   Yaniv Kamay  <yaniv@qumranet.com>
>    */
>   
> -#include <kvm/iodev.h>
> -
>   #include <linux/kvm_host.h>
> +#include <linux/kvm_iodev.h>
>   #include <linux/kvm.h>
>   #include <linux/module.h>
>   #include <linux/errno.h>
> 
About modification with LoongArch specific.
Reviewed-by: Bibo Mao <maobibo@loongson.cn>

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.