From 45bc2f0278d79deb6c934ab4cbeff696cdcfd0ef Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Tue, 12 Apr 2011 21:12:23 +0300 Subject: [PATCH] kvm tools: Don't override kernel image passed by user Commit d3f84f3 ("kvm tools: Use host kernel image by default") broke user specified kernel image parsing. Fix that up. Reported-by: Prasad Joshi Signed-off-by: Pekka Enberg --- kvm-run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kvm-run.c b/kvm-run.c index 4986d6c..48f50c7 100644 --- a/kvm-run.c +++ b/kvm-run.c @@ -177,7 +177,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix) } - kernel_filename = find_host_kernel(); + if (!kernel_filename) + kernel_filename = find_host_kernel(); if (!kernel_filename) { usage_with_options(run_usage, options);