From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51984) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r33-0006hR-QO for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:16:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3r2x-0003yD-7c for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:15:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48931 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r2w-0003xE-Q8 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:15:46 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 19:15:29 +0200 Message-Id: <1375118141-8550-3-git-send-email-afaerber@suse.de> In-Reply-To: <1375118141-8550-1-git-send-email-afaerber@suse.de> References: <1375118141-8550-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-1.6? 02/14] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws, Paul Brook Signed-off-by: Andreas F=C3=A4rber --- hw/arm/boot.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 2cbeefd..0c6d611 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -15,6 +15,7 @@ #include "hw/loader.h" #include "elf.h" #include "sysemu/device_tree.h" +#include "sysemu/qtest.h" #include "qemu/config-file.h" =20 #define KERNEL_ARGS_ADDR 0x100 @@ -354,6 +355,9 @@ void arm_load_kernel(ARMCPU *cpu, struct arm_boot_inf= o *info) =20 /* Load the kernel. */ if (!info->kernel_filename) { + if (qtest_enabled()) { + return; + } fprintf(stderr, "Kernel image must be specified\n"); exit(1); } --=20 1.8.1.4