From patchwork Mon Jul 29 17:15:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 262913 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A97502C007B for ; Tue, 30 Jul 2013 03:22:07 +1000 (EST) Received: from localhost ([::1]:58752 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r93-0007wx-Fb for incoming@patchwork.ozlabs.org; Mon, 29 Jul 2013 13:22:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r34-0006hW-Lq for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:16:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3r2x-0003yx-Oy for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:15:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48959 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r2x-0003y0-BY for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:15:47 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 68A34A5527; Mon, 29 Jul 2013 19:15:46 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Mon, 29 Jul 2013 19:15:40 +0200 Message-Id: <1375118141-8550-14-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.8.1.4 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 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws, Paul Brook Subject: [Qemu-devel] [PATCH for-1.6? 13/14] an5206: Don't enforce use of kernel for qtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Andreas Färber --- hw/m68k/an5206.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 0c03a87..abf7d1c 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -12,6 +12,7 @@ #include "hw/loader.h" #include "elf.h" #include "exec/address-spaces.h" +#include "sysemu/qtest.h" #define KERNEL_LOAD_ADDR 0x10000 #define AN5206_MBAR_ADDR 0x10000000 @@ -62,6 +63,9 @@ static void an5206_init(QEMUMachineInitArgs *args) /* Load kernel. */ if (!kernel_filename) { + if (qtest_enabled()) { + return; + } fprintf(stderr, "Kernel image must be specified\n"); exit(1); }