From patchwork Sat Jul 9 06:57:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 958802 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p696xIAX019687 for ; Sat, 9 Jul 2011 06:59:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751098Ab1GIG6D (ORCPT ); Sat, 9 Jul 2011 02:58:03 -0400 Received: from mail-wy0-f174.google.com ([74.125.82.174]:44681 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783Ab1GIG6C (ORCPT ); Sat, 9 Jul 2011 02:58:02 -0400 Received: by wyg8 with SMTP id 8so1698335wyg.19 for ; Fri, 08 Jul 2011 23:58:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=+p8ywHeXft7ug0bHDusw29GPgRUnCXWfKyPFKPK9ZGc=; b=jWrBAsBNqAKswi+Z2hDbwnAGKZMGEbUjiRXx0MoWi2nOuyTMbSBdmMUGOTje31s/nU W04Fs3LqxkDOBOHW6JF3v6cuSalvmw2YeQL4loIykcxfhLDz1XjS4/c7Wbl7sn6BX29p vx7HZj7J5eWua+jfuVBdeZtIL09hLmRHO+lcM= Received: by 10.227.201.197 with SMTP id fb5mr2544912wbb.103.1310194680881; Fri, 08 Jul 2011 23:58:00 -0700 (PDT) Received: from localhost.localdomain (bzq-79-178-209-230.red.bezeqint.net [79.178.209.230]) by mx.google.com with ESMTPS id em16sm3030788wbb.33.2011.07.08.23.57.57 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 08 Jul 2011 23:58:00 -0700 (PDT) From: Sasha Levin To: penberg@kernel.org Cc: kvm@vger.kernel.org, mingo@elte.hu, asias.hejun@gmail.com, gorcunov@gmail.com, prasadjoshi124@gmail.com, Sasha Levin Subject: [PATCH v2 1/2] kvm tools: Rename command source files Date: Sat, 9 Jul 2011 09:57:29 +0300 Message-Id: <1310194650-29215-1-git-send-email-levinsasha928@gmail.com> X-Mailer: git-send-email 1.7.6 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 09 Jul 2011 06:59:27 +0000 (UTC) Rename kvm-[command] into builtin-[command] to prevent clashes with non-command files such as kvm-cpu.h Suggested-by: Pekka Enberg Signed-off-by: Sasha Levin --- tools/kvm/Makefile | 18 +++++++++--------- tools/kvm/{kvm-balloon.c => builtin-balloon.c} | 2 +- tools/kvm/{kvm-debug.c => builtin-debug.c} | 2 +- tools/kvm/{kvm-help.c => builtin-help.c} | 2 +- tools/kvm/{kvm-list.c => builtin-list.c} | 2 +- tools/kvm/{kvm-pause.c => builtin-pause.c} | 2 +- tools/kvm/{kvm-run.c => builtin-run.c} | 2 +- tools/kvm/{kvm-version.c => builtin-version.c} | 2 +- .../kvm/{kvm-balloon.h => builtin-balloon.h} | 0 .../include/kvm/{kvm-debug.h => builtin-debug.h} | 0 .../kvm/include/kvm/{kvm-help.h => builtin-help.h} | 0 .../kvm/include/kvm/{kvm-list.h => builtin-list.h} | 0 .../include/kvm/{kvm-pause.h => builtin-pause.h} | 0 tools/kvm/include/kvm/{kvm-run.h => builtin-run.h} | 0 .../kvm/{kvm-version.h => builtin-version.h} | 0 tools/kvm/kvm-cmd.c | 14 +++++++------- 16 files changed, 23 insertions(+), 23 deletions(-) rename tools/kvm/{kvm-balloon.c => builtin-balloon.c} (95%) rename tools/kvm/{kvm-debug.c => builtin-debug.c} (94%) rename tools/kvm/{kvm-help.c => builtin-help.c} (97%) rename tools/kvm/{kvm-list.c => builtin-list.c} (96%) rename tools/kvm/{kvm-pause.c => builtin-pause.c} (94%) rename tools/kvm/{kvm-run.c => builtin-run.c} (99%) rename tools/kvm/{kvm-version.c => builtin-version.c} (88%) rename tools/kvm/include/kvm/{kvm-balloon.h => builtin-balloon.h} (100%) rename tools/kvm/include/kvm/{kvm-debug.h => builtin-debug.h} (100%) rename tools/kvm/include/kvm/{kvm-help.h => builtin-help.h} (100%) rename tools/kvm/include/kvm/{kvm-list.h => builtin-list.h} (100%) rename tools/kvm/include/kvm/{kvm-pause.h => builtin-pause.h} (100%) rename tools/kvm/include/kvm/{kvm-run.h => builtin-run.h} (100%) rename tools/kvm/include/kvm/{kvm-version.h => builtin-version.h} (100%) diff --git a/tools/kvm/Makefile b/tools/kvm/Makefile index 5ec222f..7f1b1c5 100644 --- 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 277cada..319941d 100644 --- a/tools/kvm/kvm-balloon.c +++ b/tools/kvm/builtin-balloon.c @@ -4,7 +4,7 @@ #include #include -#include +#include #include 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 676f311..153badd 100644 --- a/tools/kvm/kvm-debug.c +++ b/tools/kvm/builtin-debug.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include 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 817e4f8..e89cd5c 100644 --- a/tools/kvm/kvm-help.c +++ b/tools/kvm/builtin-help.c @@ -6,7 +6,7 @@ #include #include -#include +#include 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 40c0e48..dde3fb3 100644 --- a/tools/kvm/kvm-list.c +++ b/tools/kvm/builtin-list.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include 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 ea4f95d..0c0010d 100644 --- a/tools/kvm/kvm-pause.c +++ b/tools/kvm/builtin-pause.c @@ -4,7 +4,7 @@ #include #include -#include +#include #include 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 048b6a2..09bd1da 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/builtin-run.c @@ -37,7 +37,7 @@ #include /* header files for gitish interface */ -#include +#include #include #include 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 e30f74c..5b3b598 100644 --- a/tools/kvm/kvm-version.c +++ b/tools/kvm/builtin-version.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include 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 404065b..a954a61 100644 --- a/tools/kvm/kvm-cmd.c +++ b/tools/kvm/kvm-cmd.c @@ -5,14 +5,14 @@ #include /* 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 },