From: Andreas Färber <afaerber@suse.de>
Date: Sun, 4 Aug 2013 14:49:28 +0000 (+0200)
Subject: milkymist: Suppress -kernel/-bios/-drive error for qtest
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c00eb5cee145ec7ff030a6bfcb98afd7285868c2;p=qemu.git

milkymist: Suppress -kernel/-bios/-drive error for qtest

Acked-by: Michael Walle <michael@walle.cc>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index f1744ec07e..15053c4c37 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -21,6 +21,7 @@
 #include "hw/hw.h"
 #include "hw/block/flash.h"
 #include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
 #include "hw/devices.h"
 #include "hw/boards.h"
 #include "hw/loader.h"
@@ -143,7 +144,7 @@ milkymist_init(QEMUMachineInitArgs *args)
     reset_info->bootstrap_pc = BIOS_OFFSET;
 
     /* if no kernel is given no valid bios rom is a fatal error */
-    if (!kernel_filename && !dinfo && !bios_filename) {
+    if (!kernel_filename && !dinfo && !bios_filename && !qtest_enabled()) {
         fprintf(stderr, "qemu: could not load Milkymist One bios '%s'\n",
                 bios_name);
         exit(1);