[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 14/18] milkymist: Suppress -kernel/-bios/-drive e
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH v3 14/18] milkymist: Suppress -kernel/-bios/-drive error for qtest |
Date: |
Mon, 23 Sep 2013 15:35:48 +0200 |
Acked-by: Michael Walle <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/lm32/milkymist.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index f1744ec..15053c4 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);
--
1.8.1.4
- [Qemu-devel] [PATCH v3 00/18] qtest: Test all targets, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 06/18] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 16/18] shix: Don't require firmware presence for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 03/18] puv3: Turn puv3_load_kernel() into a no-op for qtest without -kernel, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 09/18] exynos4_boards: Silence lack of -smp 2 warning for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 12/18] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/09/23
- [Qemu-devel] [PATCH v3 08/18] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/09/23