From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Daney Subject: Re: [PATCH v4 5/7] MIPS: KVM: Rename files to remove the prefix "kvm_" and "kvm_mips_" Date: Thu, 26 Jun 2014 12:28:38 -0700 Message-ID: <53AC7466.6070401@gmail.com> References: <1403809900-17454-1-git-send-email-dengcheng.zhu@imgtec.com> <1403809900-17454-6-git-send-email-dengcheng.zhu@imgtec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: pbonzini@redhat.com, gleb@kernel.org, kvm@vger.kernel.org, sanjayl@kymasys.com, james.hogan@imgtec.com, ralf@linux-mips.org, linux-mips@linux-mips.org To: Deng-Cheng Zhu Return-path: Received: from mail-ig0-f170.google.com ([209.85.213.170]:61485 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750737AbaFZT2k (ORCPT ); Thu, 26 Jun 2014 15:28:40 -0400 Received: by mail-ig0-f170.google.com with SMTP id h15so1125520igd.3 for ; Thu, 26 Jun 2014 12:28:40 -0700 (PDT) In-Reply-To: <1403809900-17454-6-git-send-email-dengcheng.zhu@imgtec.com> Sender: kvm-owner@vger.kernel.org List-ID: On 06/26/2014 12:11 PM, Deng-Cheng Zhu wrote: > From: Deng-Cheng Zhu > > Since all the files are in arch/mips/kvm/, there's no need of the prefixes > "kvm_" and "kvm_mips_". > I don't like this change. It will leads me to confuse arch/mips/kvm/interrupt.h with include/linux/interrupt.h x86 calls these things irq.c and irq.h, perhaps that would be a little better. There is precedence in x86 for some of the names though. But really why churn up the code in the first place? the kvm_mips prefix does tell us exactly what we are dealing with. > Reviewed-by: James Hogan > Signed-off-by: Deng-Cheng Zhu > --- > arch/mips/kvm/Makefile | 8 ++++---- > arch/mips/kvm/{kvm_cb.c => callback.c} | 0 > arch/mips/kvm/{kvm_mips_commpage.c => commpage.c} | 2 +- > arch/mips/kvm/{kvm_mips_comm.h => commpage.h} | 0 > arch/mips/kvm/{kvm_mips_dyntrans.c => dyntrans.c} | 2 +- > arch/mips/kvm/{kvm_mips_emul.c => emulate.c} | 6 +++--- > arch/mips/kvm/{kvm_mips_int.c => interrupt.c} | 2 +- > arch/mips/kvm/{kvm_mips_int.h => interrupt.h} | 0 > arch/mips/kvm/{kvm_locore.S => locore.S} | 0 > arch/mips/kvm/{kvm_mips.c => mips.c} | 6 +++--- > arch/mips/kvm/{kvm_mips_opcode.h => opcode.h} | 0 > arch/mips/kvm/{kvm_mips_stats.c => stats.c} | 0 > arch/mips/kvm/{kvm_tlb.c => tlb.c} | 0 > arch/mips/kvm/{kvm_trap_emul.c => trap_emul.c} | 4 ++-- > 14 files changed, 15 insertions(+), 15 deletions(-) > rename arch/mips/kvm/{kvm_cb.c => callback.c} (100%) > rename arch/mips/kvm/{kvm_mips_commpage.c => commpage.c} (97%) > rename arch/mips/kvm/{kvm_mips_comm.h => commpage.h} (100%) > rename arch/mips/kvm/{kvm_mips_dyntrans.c => dyntrans.c} (99%) > rename arch/mips/kvm/{kvm_mips_emul.c => emulate.c} (99%) > rename arch/mips/kvm/{kvm_mips_int.c => interrupt.c} (99%) > rename arch/mips/kvm/{kvm_mips_int.h => interrupt.h} (100%) > rename arch/mips/kvm/{kvm_locore.S => locore.S} (100%) > rename arch/mips/kvm/{kvm_mips.c => mips.c} (99%) > rename arch/mips/kvm/{kvm_mips_opcode.h => opcode.h} (100%) > rename arch/mips/kvm/{kvm_mips_stats.c => stats.c} (100%) > rename arch/mips/kvm/{kvm_tlb.c => tlb.c} (100%) > rename arch/mips/kvm/{kvm_trap_emul.c => trap_emul.c} (99%) > > diff --git a/arch/mips/kvm/Makefile b/arch/mips/kvm/Makefile > index 78d87bb..401fe02 100644 > --- a/arch/mips/kvm/Makefile > +++ b/arch/mips/kvm/Makefile > @@ -5,9 +5,9 @@ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o coalesced_mmio.o) > > EXTRA_CFLAGS += -Ivirt/kvm -Iarch/mips/kvm > > -kvm-objs := $(common-objs) kvm_mips.o kvm_mips_emul.o kvm_locore.o \ > - kvm_mips_int.o kvm_mips_stats.o kvm_mips_commpage.o \ > - kvm_mips_dyntrans.o kvm_trap_emul.o > +kvm-objs := $(common-objs) mips.o emulate.o locore.o \ > + interrupt.o stats.o commpage.o \ > + dyntrans.o trap_emul.o > > obj-$(CONFIG_KVM) += kvm.o > -obj-y += kvm_cb.o kvm_tlb.o > +obj-y += callback.o tlb.o > diff --git a/arch/mips/kvm/kvm_cb.c b/arch/mips/kvm/callback.c > similarity index 100% > rename from arch/mips/kvm/kvm_cb.c > rename to arch/mips/kvm/callback.c > diff --git a/arch/mips/kvm/kvm_mips_commpage.c b/arch/mips/kvm/commpage.c > similarity index 97% > rename from arch/mips/kvm/kvm_mips_commpage.c > rename to arch/mips/kvm/commpage.c > index 4b5612b..61b9c04 100644 > --- a/arch/mips/kvm/kvm_mips_commpage.c > +++ b/arch/mips/kvm/commpage.c > @@ -22,7 +22,7 @@ > > #include > > -#include "kvm_mips_comm.h" > +#include "commpage.h" > > void kvm_mips_commpage_init(struct kvm_vcpu *vcpu) > { > diff --git a/arch/mips/kvm/kvm_mips_comm.h b/arch/mips/kvm/commpage.h > similarity index 100% > rename from arch/mips/kvm/kvm_mips_comm.h > rename to arch/mips/kvm/commpage.h > diff --git a/arch/mips/kvm/kvm_mips_dyntrans.c b/arch/mips/kvm/dyntrans.c > similarity index 99% > rename from arch/mips/kvm/kvm_mips_dyntrans.c > rename to arch/mips/kvm/dyntrans.c > index fa7184d..521121b 100644 > --- a/arch/mips/kvm/kvm_mips_dyntrans.c > +++ b/arch/mips/kvm/dyntrans.c > @@ -18,7 +18,7 @@ > #include > #include > > -#include "kvm_mips_comm.h" > +#include "commpage.h" > > #define SYNCI_TEMPLATE 0x041f0000 > #define SYNCI_BASE(x) (((x) >> 21) & 0x1f) > diff --git a/arch/mips/kvm/kvm_mips_emul.c b/arch/mips/kvm/emulate.c > similarity index 99% > rename from arch/mips/kvm/kvm_mips_emul.c > rename to arch/mips/kvm/emulate.c > index f9b4f0f..1a60688 100644 > --- a/arch/mips/kvm/kvm_mips_emul.c > +++ b/arch/mips/kvm/emulate.c > @@ -29,9 +29,9 @@ > #include > #define CONFIG_MIPS_MT > > -#include "kvm_mips_opcode.h" > -#include "kvm_mips_int.h" > -#include "kvm_mips_comm.h" > +#include "opcode.h" > +#include "interrupt.h" > +#include "commpage.h" > > #include "trace.h" > > diff --git a/arch/mips/kvm/kvm_mips_int.c b/arch/mips/kvm/interrupt.c > similarity index 99% > rename from arch/mips/kvm/kvm_mips_int.c > rename to arch/mips/kvm/interrupt.c > index d458c04..9b44459 100644 > --- a/arch/mips/kvm/kvm_mips_int.c > +++ b/arch/mips/kvm/interrupt.c > @@ -20,7 +20,7 @@ > > #include > > -#include "kvm_mips_int.h" > +#include "interrupt.h" > > void kvm_mips_queue_irq(struct kvm_vcpu *vcpu, uint32_t priority) > { > diff --git a/arch/mips/kvm/kvm_mips_int.h b/arch/mips/kvm/interrupt.h > similarity index 100% > rename from arch/mips/kvm/kvm_mips_int.h > rename to arch/mips/kvm/interrupt.h > diff --git a/arch/mips/kvm/kvm_locore.S b/arch/mips/kvm/locore.S > similarity index 100% > rename from arch/mips/kvm/kvm_locore.S > rename to arch/mips/kvm/locore.S > diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/mips.c > similarity index 99% > rename from arch/mips/kvm/kvm_mips.c > rename to arch/mips/kvm/mips.c > index 289b4d2..d687c6e 100644 > --- a/arch/mips/kvm/kvm_mips.c > +++ b/arch/mips/kvm/mips.c > @@ -21,8 +21,8 @@ > > #include > > -#include "kvm_mips_int.h" > -#include "kvm_mips_comm.h" > +#include "interrupt.h" > +#include "commpage.h" > > #define CREATE_TRACE_POINTS > #include "trace.h" > @@ -1188,7 +1188,7 @@ int __init kvm_mips_init(void) > /* > * On MIPS, kernel modules are executed from "mapped space", which > * requires TLBs. The TLB handling code is statically linked with > - * the rest of the kernel (kvm_tlb.c) to avoid the possibility of > + * the rest of the kernel (tlb.c) to avoid the possibility of > * double faulting. The issue is that the TLB code references > * routines that are part of the the KVM module, which are only > * available once the module is loaded. > diff --git a/arch/mips/kvm/kvm_mips_opcode.h b/arch/mips/kvm/opcode.h > similarity index 100% > rename from arch/mips/kvm/kvm_mips_opcode.h > rename to arch/mips/kvm/opcode.h > diff --git a/arch/mips/kvm/kvm_mips_stats.c b/arch/mips/kvm/stats.c > similarity index 100% > rename from arch/mips/kvm/kvm_mips_stats.c > rename to arch/mips/kvm/stats.c > diff --git a/arch/mips/kvm/kvm_tlb.c b/arch/mips/kvm/tlb.c > similarity index 100% > rename from arch/mips/kvm/kvm_tlb.c > rename to arch/mips/kvm/tlb.c > diff --git a/arch/mips/kvm/kvm_trap_emul.c b/arch/mips/kvm/trap_emul.c > similarity index 99% > rename from arch/mips/kvm/kvm_trap_emul.c > rename to arch/mips/kvm/trap_emul.c > index bd2f6bc..fd7257b 100644 > --- a/arch/mips/kvm/kvm_trap_emul.c > +++ b/arch/mips/kvm/trap_emul.c > @@ -16,8 +16,8 @@ > > #include > > -#include "kvm_mips_opcode.h" > -#include "kvm_mips_int.h" > +#include "opcode.h" > +#include "interrupt.h" > > static gpa_t kvm_trap_emul_gva_to_gpa_cb(gva_t gva) > { >