Re: [PATCH v6 14/33] KVM: s390: Rename kvm-s390.{c,h} to s390.{c,h}

Am 12.08.26 um 17:36 schrieb Steffen Eiden:
> Rename kvm-s390.c to s390.c and kvm-s390.h to s390.h for consistency
> with the new directory structure. Update all include statements and
> simplify Makefile ccflags from explicit paths to -I$(src).
> 
> No functional change.
> 
> Signed-off-by: Steffen Eiden <[email protected]>

Reviewed-by: Christian Borntraeger <[email protected]>

> ---
>   arch/s390/kvm/Makefile               | 4 ++--
>   arch/s390/kvm/diag.c                 | 2 +-
>   arch/s390/kvm/gaccess.c              | 2 +-
>   arch/s390/kvm/gaccess.h              | 2 +-
>   arch/s390/kvm/gmap.c                 | 2 +-
>   arch/s390/kvm/guestdbg.c             | 2 +-
>   arch/s390/kvm/intercept.c            | 2 +-
>   arch/s390/kvm/interrupt.c            | 2 +-
>   arch/s390/kvm/pci.c                  | 2 +-
>   arch/s390/kvm/priv.c                 | 2 +-
>   arch/s390/kvm/pv.c                   | 2 +-
>   arch/s390/kvm/{kvm-s390.c => s390.c} | 2 +-
>   arch/s390/kvm/{kvm-s390.h => s390.h} | 2 +-
>   arch/s390/kvm/sigp.c                 | 2 +-
>   arch/s390/kvm/vsie.c                 | 2 +-
>   15 files changed, 16 insertions(+), 16 deletions(-)
>   rename arch/s390/kvm/{kvm-s390.c => s390.c} (99%)
>   rename arch/s390/kvm/{kvm-s390.h => s390.h} (99%)
> 
> diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile
> index dac9d53b23d8..961de97b8e80 100644
> --- a/arch/s390/kvm/Makefile
> +++ b/arch/s390/kvm/Makefile
> @@ -5,9 +5,9 @@
>   
>   include $(srctree)/virt/kvm/Makefile.kvm
>   
> -ccflags-y := -Ivirt/kvm -Iarch/s390/kvm
> +ccflags-y := -I$(src)
>   
> -kvm-y += kvm-s390.o intercept.o interrupt.o priv.o sigp.o
> +kvm-y += s390.o intercept.o interrupt.o priv.o sigp.o
>   kvm-y += diag.o gaccess.o guestdbg.o vsie.o pv.o
>   kvm-y += dat.o gmap.o faultin.o
>   
> diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
> index 031ab6e5d6c4..09033c8ff1bb 100644
> --- a/arch/s390/kvm/diag.c
> +++ b/arch/s390/kvm/diag.c
> @@ -12,7 +12,7 @@
>   #include <linux/kvm_host.h>
>   #include <asm/gmap_helpers.h>
>   #include <asm/virtio-ccw.h>
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "trace.h"
>   #include "trace-s390.h"
>   #include "gaccess.h"
> diff --git a/arch/s390/kvm/gaccess.c b/arch/s390/kvm/gaccess.c
> index 0d389a302a70..e5c064f263df 100644
> --- a/arch/s390/kvm/gaccess.c
> +++ b/arch/s390/kvm/gaccess.c
> @@ -17,7 +17,7 @@
>   #include <asm/access-regs.h>
>   #include <asm/fault.h>
>   #include <asm/dat-bits.h>
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "dat.h"
>   #include "gmap.h"
>   #include "gaccess.h"
> diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h
> index b5385cec60f4..ef922b3b4990 100644
> --- a/arch/s390/kvm/gaccess.h
> +++ b/arch/s390/kvm/gaccess.h
> @@ -14,7 +14,7 @@
>   #include <linux/kvm_host.h>
>   #include <linux/uaccess.h>
>   #include <linux/ptrace.h>
> -#include "kvm-s390.h"
> +#include "s390.h"
>   
>   /**
>    * kvm_s390_real_to_abs - convert guest real address to guest absolute address
> diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap.c
> index 3758e4009709..b5b920392378 100644
> --- a/arch/s390/kvm/gmap.c
> +++ b/arch/s390/kvm/gmap.c
> @@ -21,7 +21,7 @@
>   
>   #include "dat.h"
>   #include "gmap.h"
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "faultin.h"
>   
>   static inline bool kvm_s390_is_in_sie(struct kvm_vcpu *vcpu)
> diff --git a/arch/s390/kvm/guestdbg.c b/arch/s390/kvm/guestdbg.c
> index 9a6149e310bb..1bf7e91b7e61 100644
> --- a/arch/s390/kvm/guestdbg.c
> +++ b/arch/s390/kvm/guestdbg.c
> @@ -8,7 +8,7 @@
>    */
>   #include <linux/kvm_host.h>
>   #include <linux/errno.h>
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "gaccess.h"
>   
>   /*
> diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c
> index 1980df61ef30..ca1205dfac8b 100644
> --- a/arch/s390/kvm/intercept.c
> +++ b/arch/s390/kvm/intercept.c
> @@ -17,7 +17,7 @@
>   #include <asm/sysinfo.h>
>   #include <asm/uv.h>
>   
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "gaccess.h"
>   #include "trace.h"
>   #include "trace-s390.h"
> diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
> index 0d9fbe75dc66..9aa786952718 100644
> --- a/arch/s390/kvm/interrupt.c
> +++ b/arch/s390/kvm/interrupt.c
> @@ -29,7 +29,7 @@
>   #include <asm/nmi.h>
>   #include <asm/airq.h>
>   #include <asm/tpi.h>
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "gaccess.h"
>   #include "trace-s390.h"
>   #include "pci.h"
> diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c
> index 50f5ec79600e..82892e1e03d9 100644
> --- a/arch/s390/kvm/pci.c
> +++ b/arch/s390/kvm/pci.c
> @@ -14,7 +14,7 @@
>   #include <asm/pci_io.h>
>   #include <asm/sclp.h>
>   #include "pci.h"
> -#include "kvm-s390.h"
> +#include "s390.h"
>   
>   struct zpci_aift *aift;
>   
> diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
> index b1ba24c346ef..b3cb2c2c3aa7 100644
> --- a/arch/s390/kvm/priv.c
> +++ b/arch/s390/kvm/priv.c
> @@ -26,7 +26,7 @@
>   #include <asm/ap.h>
>   #include <asm/gmap_helpers.h>
>   #include "gaccess.h"
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "trace.h"
>   #include "gmap.h"
>   
> diff --git a/arch/s390/kvm/pv.c b/arch/s390/kvm/pv.c
> index f549b161b972..7adfdc9b62be 100644
> --- a/arch/s390/kvm/pv.c
> +++ b/arch/s390/kvm/pv.c
> @@ -18,7 +18,7 @@
>   #include <linux/sched/mm.h>
>   #include <linux/mmu_notifier.h>
>   #include <asm/gmap_helpers.h>
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "dat.h"
>   #include "gaccess.h"
>   #include "gmap.h"
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/s390.c
> similarity index 99%
> rename from arch/s390/kvm/kvm-s390.c
> rename to arch/s390/kvm/s390.c
> index 4faff6625da3..ff09ffc10f0d 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/s390.c
> @@ -50,7 +50,7 @@
>   #include <asm/fpu.h>
>   #include <asm/ap.h>
>   #include <asm/uv.h>
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "gaccess.h"
>   #include "gmap.h"
>   #include "faultin.h"
> diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/s390.h
> similarity index 99%
> rename from arch/s390/kvm/kvm-s390.h
> rename to arch/s390/kvm/s390.h
> index 6d2842fb71a3..e144ca2e6d5e 100644
> --- a/arch/s390/kvm/kvm-s390.h
> +++ b/arch/s390/kvm/s390.h
> @@ -452,7 +452,7 @@ void kvm_s390_vsie_destroy(struct kvm *kvm);
>   int kvm_s390_handle_sigp(struct kvm_vcpu *vcpu);
>   int kvm_s390_handle_sigp_pei(struct kvm_vcpu *vcpu);
>   
> -/* implemented in kvm-s390.c */
> +/* implemented in s390.c */
>   int kvm_s390_try_set_tod_clock(struct kvm *kvm, const struct kvm_s390_vm_tod_clock *gtod);
>   int kvm_s390_store_status_unloaded(struct kvm_vcpu *vcpu, unsigned long addr);
>   int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr);
> diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c
> index 55c34cb35428..131b3371ef4f 100644
> --- a/arch/s390/kvm/sigp.c
> +++ b/arch/s390/kvm/sigp.c
> @@ -14,7 +14,7 @@
>   #include <linux/slab.h>
>   #include <asm/sigp.h>
>   #include "gaccess.h"
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "trace.h"
>   
>   static int __sigp_sense(struct kvm_vcpu *vcpu, struct kvm_vcpu *dst_vcpu,
> diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
> index f546239d8ff8..cc94ede0621f 100644
> --- a/arch/s390/kvm/vsie.c
> +++ b/arch/s390/kvm/vsie.c
> @@ -23,7 +23,7 @@
>   #include <asm/nmi.h>
>   #include <asm/dis.h>
>   #include <asm/facility.h>
> -#include "kvm-s390.h"
> +#include "s390.h"
>   #include "gaccess.h"
>   #include "gmap.h"
>