kvm tools: pick kernel from linux source tree root

Pick arch/$ARCH/boot/bzImage and vmlinux if we are in linux source tree root directory.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index 6bd9638e16f7a2d2575b5de8021c8021a84ed56c..27daf0fea8586ec34a12f70126381e0ba70386ab 100644 (file)
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -635,11 +635,13 @@ static const char *host_kernels[] = {
 
 static const char *default_kernels[] = {
        "./bzImage",
+       "arch/" BUILD_ARCH "/boot/bzImage",
        "../../arch/" BUILD_ARCH "/boot/bzImage",
        NULL
 };
 
 static const char *default_vmlinux[] = {
+       "vmlinux",
        "../../../vmlinux",
        "../../vmlinux",
        NULL