From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konstantin Khlebnikov Subject: [PATCH] kvm tools: pick kernel from linux source tree root Date: Wed, 21 Dec 2011 14:18:00 +0300 Message-ID: <20111221101800.8547.47150.stgit@zurg> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: penberg@kernel.org, kvm@vger.kernel.org Return-path: Received: from mail-ww0-f44.google.com ([74.125.82.44]:44161 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752624Ab1LUKSE (ORCPT ); Wed, 21 Dec 2011 05:18:04 -0500 Received: by wgbdr13 with SMTP id dr13so13988035wgb.1 for ; Wed, 21 Dec 2011 02:18:03 -0800 (PST) Sender: kvm-owner@vger.kernel.org List-ID: Pick arch/$ARCH/boot/bzImage and vmlinux if we are in linux source tree root directory. Signed-off-by: Konstantin Khlebnikov --- 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 094c0fa2..50f1de9 100644 --- a/tools/kvm/builtin-run.c +++ b/tools/kvm/builtin-run.c @@ -609,11 +609,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