From ee4a660251fce4bcea4aee3c76160870cb37e327 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 11 Dec 2011 21:27:16 +0200 Subject: [PATCH] kvm tools: Call executable 'lkvm' and add 'vm' alias Several people have raised up the issue with our 'kvm' executable name. Rusty came up with 'lkvm' which even Ingo is reasonably happy with: I could live with: - keeping 'tools/kvm/' as the tool project name - 'lkvm' as the binary - a command alias binary (hardlink) to 'vm'. I just checked, it's not used by any other package. ... and be done with it? 'lkvm' rhymes nicely to 'lkml' as well, so it's not a 100% bad name. Suggested-by: Rusty Russell Suggested-by: Ingo Molnar Signed-off-by: Pekka Enberg --- .gitignore | 3 ++- Makefile | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ace4ec..be6c6f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -/kvm +/lkvm +/vm *.o *.d .cscope diff --git a/Makefile b/Makefile index cef3c44..579e7b0 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,8 @@ FIND := find CSCOPE := cscope TAGS := ctags -PROGRAM := kvm +PROGRAM := lkvm +PROGRAM_ALIAS := vm GUEST_INIT := guest/init GUEST_INIT_S2 := guest/init_stage2 @@ -209,7 +210,7 @@ WARNINGS += -Wwrite-strings CFLAGS += $(WARNINGS) -all: arch_support_check $(PROGRAM) $(GUEST_INIT) $(GUEST_INIT_S2) +all: arch_support_check $(PROGRAM) $(PROGRAM_ALIAS) $(GUEST_INIT) $(GUEST_INIT_S2) arch_support_check: $(UNSUPP_ERR) @@ -222,6 +223,10 @@ $(PROGRAM): $(DEPS) $(OBJS) $(E) " LINK " $@ $(Q) $(CC) $(OBJS) $(LIBS) -o $@ +$(PROGRAM_ALIAS): $(PROGRAM) + $(E) " LN " $@ + $(Q) ln -f $(PROGRAM) $@ + $(GUEST_INIT): guest/init.c $(E) " LINK " $@ $(Q) $(CC) -static guest/init.c -o $@