Commit-ID: bd80ec71593b0de39dcd78b38a00e0adf477aabc Gitweb: http://git.kernel.org/tip/bd80ec71593b0de39dcd78b38a00e0adf477aabc Author: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxx> AuthorDate: Wed, 21 Dec 2011 14:18:00 +0300 Committer: Pekka Enberg <penberg@xxxxxxxxxx> CommitDate: Tue, 3 Jan 2012 19:10:36 +0200 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@xxxxxxxxxx> Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx> --- tools/kvm/builtin-run.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c index 6bd9638..27daf0f 100644 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html