From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pekka Enberg Subject: [PATCH] kvm tools: Use host kernel image by default Date: Tue, 12 Apr 2011 20:51:29 +0300 Message-ID: <1302630689-13498-1-git-send-email-penberg@kernel.org> Cc: Pekka Enberg , Asias He , Cyrill Gorcunov , Ingo Molnar To: kvm@vger.kernel.org Return-path: Received: from filtteri5.pp.htv.fi ([213.243.153.188]:52458 "EHLO filtteri5.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751844Ab1DLRvc (ORCPT ); Tue, 12 Apr 2011 13:51:32 -0400 Sender: kvm-owner@vger.kernel.org List-ID: If user doesn't specify a kernel image for 'kvm run' command, try to look up host kernel kernel image from /boot directory and use it as guest kernel. Cc: Asias He Cc: Cyrill Gorcunov Cc: Ingo Molnar Signed-off-by: Pekka Enberg --- tools/kvm/kvm-run.c | 40 +++++++++++++++++++++++++++++++++------- 1 files changed, 33 insertions(+), 7 deletions(-) diff --git a/tools/kvm/kvm-run.c b/tools/kvm/kvm-run.c index ba02172..4986d6c 100644 --- a/tools/kvm/kvm-run.c +++ b/tools/kvm/kvm-run.c @@ -6,6 +6,9 @@ #include #include #include +#include +#include +#include /* user defined header files */ #include @@ -68,7 +71,7 @@ extern int active_console; static int nrcpus = 1; static const char * const run_usage[] = { - "kvm run [] ", + "kvm run [] []", NULL }; @@ -122,6 +125,28 @@ panic_kvm: return (void *) (intptr_t) 1; } +static char host_kernel[PATH_MAX]; + +static const char *find_host_kernel(void) +{ + struct utsname uts; + struct stat st; + + if (uname(&uts) < 0) + return NULL; + + if (snprintf(host_kernel, PATH_MAX, "/boot/vmlinuz-%s", uts.release) < 0) + return NULL; + + if (stat(host_kernel, &st) < 0) + return NULL; + + if (!S_ISREG(st.st_mode)) + return NULL; + + return host_kernel; +} + int kvm_cmd_run(int argc, const char **argv, const char *prefix) { static char real_cmdline[2048]; @@ -132,12 +157,6 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) signal(SIGQUIT, handle_sigquit); signal(SIGINT, handle_sigint); - if (!argv || !*argv) { - /* no argument specified */ - usage_with_options(run_usage, options); - return EINVAL; - } - while (argc != 0) { argc = parse_options(argc, argv, options, run_usage, PARSE_OPT_STOP_AT_NON_OPTION); @@ -158,6 +177,13 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) } + kernel_filename = find_host_kernel(); + + if (!kernel_filename) { + usage_with_options(run_usage, options); + return EINVAL; + } + if (nrcpus < 1 || nrcpus > KVM_NR_CPUS) die("Number of CPUs %d is out of [1;%d] range", nrcpus, KVM_NR_CPUS); -- 1.7.0.4