qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Andreas Färber" <afaerber@suse.de>,
	"Paul Brook" <paul@codesourcery.com>
Subject: [Qemu-devel] [PATCH for-1.6? v2 12/21] mcf5208: Don't enforce use of kernel for qtest
Date: Mon,  5 Aug 2013 15:27:18 +0200	[thread overview]
Message-ID: <1375709247-10002-13-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1375709247-10002-1-git-send-email-afaerber@suse.de>

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/m68k/mcf5208.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 9cf000f..14fecc4 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -10,6 +10,7 @@
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
 #include "net/net.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
@@ -267,6 +268,9 @@ static void mcf5208evb_init(QEMUMachineInitArgs *args)
 
     /* Load kernel.  */
     if (!kernel_filename) {
+        if (qtest_enabled()) {
+            return;
+        }
         fprintf(stderr, "Kernel image must be specified\n");
         exit(1);
     }
-- 
1.8.1.4

  parent reply	other threads:[~2013-08-05 13:28 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-05 13:27 [Qemu-devel] [PATCH for-1.6? v2 00/21] qtest: Test all targets Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 01/21] mips_mipssim: Silence BIOS loading warning for qtest Andreas Färber
2013-08-07 10:12   ` Aurelien Jarno
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 02/21] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 03/21] puv3: Turn puv3_load_kernel() into a " Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 04/21] mainstone: Don't enforce use of -pflash for qtest Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 05/21] gumstix: " Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 06/21] z2: " Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 07/21] palm: Don't enforce loading ROM or kernel " Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 08/21] omap_sx1: Don't enforce use of kernel or flash " Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 09/21] exynos4_boards: Silence lack of -smp 2 warning " Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 10/21] armv7m: Don't enforce use of kernel " Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 11/21] axis_dev88: " Andreas Färber
2013-08-05 13:27 ` Andreas Färber [this message]
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 13/21] an5206: " Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 14/21] milkymist: Suppress -kernel/-bios/-drive error " Andreas Färber
2013-08-07  5:34   ` Michael Walle
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 15/21] ppc405_boards: Disable debug output Andreas Färber
2013-08-14 17:54   ` Alexander Graf
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 16/21] ppc405_uc: " Andreas Färber
2013-08-14 17:55   ` Alexander Graf
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 17/21] ppc405_boards: Don't enforce presence of firmware for qtest Andreas Färber
2013-08-14 17:55   ` Alexander Graf
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 18/21] shix: Drop debug output Andreas Färber
2013-08-07 10:13   ` Aurelien Jarno
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 19/21] shix: Don't require firmware presence for qtest Andreas Färber
2013-08-06  8:05   ` Stefan Hajnoczi
2013-08-07 10:13   ` Aurelien Jarno
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 20/21] leon3: Don't enforce use of -bios with qtest Andreas Färber
2013-08-05 13:27 ` [Qemu-devel] [PATCH for-1.6? v2 21/21] qtest: Prepare QOM machine tests Andreas Färber
2013-08-25 17:22   ` Alexander Graf
2013-08-25 17:34     ` Andreas Färber
2013-08-25 17:33   ` Peter Maydell
2013-08-25 17:42     ` Andreas Färber
2013-08-26 13:19       ` Luiz Capitulino
2013-08-06  8:39 ` [Qemu-devel] [PATCH for-1.6? v2 00/21] qtest: Test all targets Markus Armbruster
2013-08-06  9:04   ` Andreas Färber
2013-08-06  9:45     ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375709247-10002-13-git-send-email-afaerber@suse.de \
    --to=afaerber@suse.de \
    --cc=paul@codesourcery.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).