kvm tools: Rename command source files

Rename kvm-[command] into builtin-[command] to prevent
clashes with non-command files such as kvm-cpu.h

Suggested-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile
index 5ec222fbad288894063c59749ce7b66c09a3fcf6..7f1b1c5545e0831e5b91756b7edd744a9ac117cf 100644 (file)
--- a/tools/kvm/Makefile
+++ b/tools/kvm/Makefile
@@ -20,6 +20,13 @@ TAGS := ctags
 
 PROGRAM        := kvm
 
+OBJS   += builtin-balloon.o
+OBJS   += builtin-debug.o
+OBJS   += builtin-help.o
+OBJS   += builtin-list.o
+OBJS   += builtin-pause.o
+OBJS   += builtin-run.o
+OBJS   += builtin-version.o
 OBJS   += cpuid.o
 OBJS   += disk/core.o
 OBJS   += framebuffer.o
@@ -55,13 +62,6 @@ OBJS += uip/udp.o
 OBJS   += uip/buf.o
 OBJS   += uip/csum.o
 OBJS   += kvm-cmd.o
-OBJS   += kvm-debug.o
-OBJS   += kvm-help.o
-OBJS   += kvm-pause.o
-OBJS   += kvm-balloon.o
-OBJS   += kvm-list.o
-OBJS   += kvm-run.o
-OBJS   += kvm-version.o
 OBJS   += mptable.o
 OBJS   += rbtree.o
 OBJS   += threadpool.o
@@ -167,8 +167,8 @@ $(DEPS):
 %.d: %.c
        $(Q) $(CC) -M -MT $(patsubst %.d,%.o,$@) $(CFLAGS) $< -o $@
 
-# The header file common-cmds.h is needed for compilation of kvm-help.c.
-kvm-help.d: $(KVM_INCLUDE)/common-cmds.h
+# The header file common-cmds.h is needed for compilation of builtin-help.c.
+builtin-help.d: $(KVM_INCLUDE)/common-cmds.h
 
 $(OBJS):
 

diff --git a/tools/kvm/kvm-balloon.c b/tools/kvm/builtin-balloon.c
similarity index 95%
rename from tools/kvm/kvm-balloon.c
rename to tools/kvm/builtin-balloon.c
index 277cadaf544341610b8231dc156f8645bd4b9c52..319941d4d5890e1f66f834ea9e96600b8f76e08c 100644 (file)
--- a/tools/kvm/kvm-balloon.c
+++ b/tools/kvm/builtin-balloon.c
@@ -4,7 +4,7 @@
 
 #include <kvm/util.h>
 #include <kvm/kvm-cmd.h>
-#include <kvm/kvm-balloon.h>
+#include <kvm/builtin-balloon.h>
 #include <kvm/kvm.h>
 
 int kvm_cmd_balloon(int argc, const char **argv, const char *prefix)

diff --git a/tools/kvm/kvm-debug.c b/tools/kvm/builtin-debug.c
similarity index 94%
rename from tools/kvm/kvm-debug.c
rename to tools/kvm/builtin-debug.c
index 676f3116217d769627b8a23bf64b9566d86dbd4b..153badd7514b61265fc144a7058f5aedb887f69a 100644 (file)
--- a/tools/kvm/kvm-debug.c
+++ b/tools/kvm/builtin-debug.c
@@ -1,6 +1,6 @@
 #include <kvm/util.h>
 #include <kvm/kvm-cmd.h>
-#include <kvm/kvm-debug.h>
+#include <kvm/builtin-debug.h>
 #include <kvm/kvm.h>
 
 #include <stdio.h>

diff --git a/tools/kvm/kvm-help.c b/tools/kvm/builtin-help.c
similarity index 97%
rename from tools/kvm/kvm-help.c
rename to tools/kvm/builtin-help.c
index 817e4f8152d7fe13e0a1a3f5af533bd318a694ed..e89cd5cf93274783604a53d8d171b31034c807de 100644 (file)
--- a/tools/kvm/kvm-help.c
+++ b/tools/kvm/builtin-help.c
@@ -6,7 +6,7 @@
 
 #include <kvm/util.h>
 #include <kvm/kvm-cmd.h>
-#include <kvm/kvm-help.h>
+#include <kvm/builtin-help.h>
 
 
 const char kvm_usage_string[] =

diff --git a/tools/kvm/kvm-list.c b/tools/kvm/builtin-list.c
similarity index 96%
rename from tools/kvm/kvm-list.c
rename to tools/kvm/builtin-list.c
index 40c0e48b9a814c6bc6b61cb531c35d7373afe9b1..dde3fb3ecc8cca011fcad57010af012a533ba5b9 100644 (file)
--- a/tools/kvm/kvm-list.c
+++ b/tools/kvm/builtin-list.c
@@ -1,6 +1,6 @@
 #include <kvm/util.h>
 #include <kvm/kvm-cmd.h>
-#include <kvm/kvm-list.h>
+#include <kvm/builtin-list.h>
 #include <kvm/kvm.h>
 
 #include <stdio.h>

diff --git a/tools/kvm/kvm-pause.c b/tools/kvm/builtin-pause.c
similarity index 94%
rename from tools/kvm/kvm-pause.c
rename to tools/kvm/builtin-pause.c
index ea4f95d468fa6955047cba19d7838ee487e123d9..0c0010db86b5137643b969d9862b4a1d6a631972 100644 (file)
--- a/tools/kvm/kvm-pause.c
+++ b/tools/kvm/builtin-pause.c
@@ -4,7 +4,7 @@
 
 #include <kvm/util.h>
 #include <kvm/kvm-cmd.h>
-#include <kvm/kvm-pause.h>
+#include <kvm/builtin-pause.h>
 #include <kvm/kvm.h>
 
 static void do_pause(const char *name, int pid)

diff --git a/tools/kvm/kvm-run.c b/tools/kvm/builtin-run.c
similarity index 99%
rename from tools/kvm/kvm-run.c
rename to tools/kvm/builtin-run.c
index 048b6a29bb235378609a2661f7f381fce82f39ba..09bd1da9d6ea1611216a04adcfa17c5ed828d287 100644 (file)
--- a/tools/kvm/kvm-run.c
+++ b/tools/kvm/builtin-run.c
@@ -37,7 +37,7 @@
 #include <kvm/framebuffer.h>
 
 /* header files for gitish interface  */
-#include <kvm/kvm-run.h>
+#include <kvm/builtin-run.h>
 #include <kvm/parse-options.h>
 #include <kvm/mutex.h>
 

diff --git a/tools/kvm/kvm-version.c b/tools/kvm/builtin-version.c
similarity index 88%
rename from tools/kvm/kvm-version.c
rename to tools/kvm/builtin-version.c
index e30f74c4daf14a8eba4daa8f5fcdfd8dcf24af7d..5b3b5983c9e7e51772cead95c1ce09cadc78ffaf 100644 (file)
--- a/tools/kvm/kvm-version.c
+++ b/tools/kvm/builtin-version.c
@@ -1,6 +1,6 @@
 #include <kvm/util.h>
 #include <kvm/kvm-cmd.h>
-#include <kvm/kvm-version.h>
+#include <kvm/builtin-version.h>
 #include <kvm/kvm.h>
 
 #include <stdio.h>

diff --git a/tools/kvm/include/kvm/kvm-balloon.h b/tools/kvm/include/kvm/builtin-balloon.h
similarity index 100%
rename from tools/kvm/include/kvm/kvm-balloon.h
rename to tools/kvm/include/kvm/builtin-balloon.h

diff --git a/tools/kvm/include/kvm/kvm-debug.h b/tools/kvm/include/kvm/builtin-debug.h
similarity index 100%
rename from tools/kvm/include/kvm/kvm-debug.h
rename to tools/kvm/include/kvm/builtin-debug.h

diff --git a/tools/kvm/include/kvm/kvm-help.h b/tools/kvm/include/kvm/builtin-help.h
similarity index 100%
rename from tools/kvm/include/kvm/kvm-help.h
rename to tools/kvm/include/kvm/builtin-help.h

diff --git a/tools/kvm/include/kvm/kvm-list.h b/tools/kvm/include/kvm/builtin-list.h
similarity index 100%
rename from tools/kvm/include/kvm/kvm-list.h
rename to tools/kvm/include/kvm/builtin-list.h

diff --git a/tools/kvm/include/kvm/kvm-pause.h b/tools/kvm/include/kvm/builtin-pause.h
similarity index 100%
rename from tools/kvm/include/kvm/kvm-pause.h
rename to tools/kvm/include/kvm/builtin-pause.h

diff --git a/tools/kvm/include/kvm/kvm-run.h b/tools/kvm/include/kvm/builtin-run.h
similarity index 100%
rename from tools/kvm/include/kvm/kvm-run.h
rename to tools/kvm/include/kvm/builtin-run.h

diff --git a/tools/kvm/include/kvm/kvm-version.h b/tools/kvm/include/kvm/builtin-version.h
similarity index 100%
rename from tools/kvm/include/kvm/kvm-version.h
rename to tools/kvm/include/kvm/builtin-version.h

diff --git a/tools/kvm/kvm-cmd.c b/tools/kvm/kvm-cmd.c
index 404065b0a93011d536194a7f9a3dbeac880136ef..a954a6117d8f270ff45c37bb3c8c85ae67afcfe3 100644 (file)
--- a/tools/kvm/kvm-cmd.c
+++ b/tools/kvm/kvm-cmd.c
@@ -5,14 +5,14 @@
 #include <assert.h>
 
 /* user defined header files */
-#include "kvm/kvm-debug.h"
-#include "kvm/kvm-pause.h"
-#include "kvm/kvm-balloon.h"
-#include "kvm/kvm-list.h"
-#include "kvm/kvm-version.h"
-#include "kvm/kvm-help.h"
+#include "kvm/builtin-debug.h"
+#include "kvm/builtin-pause.h"
+#include "kvm/builtin-balloon.h"
+#include "kvm/builtin-list.h"
+#include "kvm/builtin-version.h"
+#include "kvm/builtin-help.h"
 #include "kvm/kvm-cmd.h"
-#include "kvm/kvm-run.h"
+#include "kvm/builtin-run.h"
 
 struct cmd_struct kvm_commands[] = {
        { "pause",      kvm_cmd_pause,          NULL,         0 },