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>,
	anthony@codemonkey.ws, "Paul Brook" <paul@codesourcery.com>
Subject: [Qemu-devel] [PATCH for-1.6? 13/14] an5206: Don't enforce use of kernel for qtest
Date: Mon, 29 Jul 2013 19:15:40 +0200	[thread overview]
Message-ID: <1375118141-8550-14-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1375118141-8550-1-git-send-email-afaerber@suse.de>

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 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);
     }
-- 
1.8.1.4

  parent reply	other threads:[~2013-07-29 17:16 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-29 17:15 [Qemu-devel] [PATCH for-1.6? 00/14] qtest: Test all targets Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 01/14] mips_mipssim: Silence BIOS loading warning for qtest Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 02/14] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 03/14] mainstone: Don't enforce use of -pflash for qtest Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 04/14] gumstix: " Andreas Färber
2013-07-30 13:20   ` Anthony Liguori
2013-07-30 13:35     ` Peter Maydell
2013-07-31 10:21     ` Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 05/14] z2: " Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 06/14] palm: Don't enforce loading ROM or kernel " Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 07/14] omap_sx1: Don't enforce use of kernel or flash " Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 08/14] exynos4_boards: Silence lack of -smp 2 warning " Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 09/14] armv7m: Don't enforce use of kernel " Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 10/14] axis_dev88: " Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 11/14] puv3: Don't assert kernel filename " Andreas Färber
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 12/14] mcf5208: Don't enforce use of kernel " Andreas Färber
2013-07-29 17:15 ` Andreas Färber [this message]
2013-07-29 17:15 ` [Qemu-devel] [PATCH for-1.6? 14/14] qtest: Add dummy machine tests Andreas Färber

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=1375118141-8550-14-git-send-email-afaerber@suse.de \
    --to=afaerber@suse.de \
    --cc=anthony@codemonkey.ws \
    --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).