clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-09-05 13:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: Use the readily built kernel with 'kvm run' if not specified explicitly

Browse Source 
Signed-off-by: Prasad Joshi <prasadjoshi124@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Prasad Joshi
2015-06-01 16:39:42 +01:00
committed by Will Deacon
parent ea6a97ea02
commit e08c089634
1 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kvm-run.c
+61 -12
View File
@@ -136,26 +136,75 @@ panic_kvm:
return (void *) (intptr_t) 1;
}
static char host_kernel[PATH_MAX];
static char kernel[PATH_MAX];
const char *host_kernels[] = {
"/boot/vmlinuz",
"/boot/bzImage",
NULL
};
const char *defult_kernels[] = {
"./bzImage",
"../../arch/x86/boot/bzImage",
NULL
};
static const char *find_host_kernel(void)
static void kernel_usage_with_options(void)
{
const char **k;
struct utsname uts;
fprintf(stderr, "Fatal: could not find default kernel image in:\n");
k = &defult_kernels[0];
while (*k) {
fprintf(stderr, "\t%s\n", *k);
k++;
}
if (uname(&uts) < 0)
return;
k = &host_kernels[0];
while (*k) {
if (snprintf(kernel, PATH_MAX, "%s-%s", *k, uts.release) < 0)
return;
fprintf(stderr, "\t%s\n", kernel);
k++;
}
usage_with_options(run_usage, options);
}
static const char *find_kernel(void)
{
const char **k;
struct stat st;
struct utsname uts;
k = &defult_kernels[0];
while (*k) {
if (stat(*k, &st) < 0 || !S_ISREG(st.st_mode)) {
k++;
continue;
}
strncpy(kernel, *k, PATH_MAX);
return kernel;
}
if (uname(&uts) < 0)
return NULL;
if (snprintf(host_kernel, PATH_MAX, "/boot/vmlinuz-%s", uts.release) < 0)
return NULL;
k = &host_kernels[0];
while (*k) {
if (snprintf(kernel, PATH_MAX, "%s-%s", *k, uts.release) < 0)
return NULL;
if (stat(host_kernel, &st) < 0)
return NULL;
if (stat(kernel, &st) < 0 || !S_ISREG(st.st_mode)) {
k++;
continue;
}
return kernel;
if (!S_ISREG(st.st_mode))
return NULL;
return host_kernel;
}
return NULL;
}
int kvm_cmd_run(int argc, const char **argv, const char *prefix)
@@ -188,10 +237,10 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
}
if (!kernel_filename)
kernel_filename = find_host_kernel();
kernel_filename = find_kernel();
if (!kernel_filename) {
usage_with_options(run_usage, options);
kernel_usage_with_options();
return EINVAL;
}