diff options
| author | Andreas Färber | 2013-08-04 16:49:28 +0200 |
|---|---|---|
| committer | Andreas Färber | 2013-11-05 17:47:29 +0100 |
| commit | c00eb5cee145ec7ff030a6bfcb98afd7285868c2 (patch) | |
| tree | ce174535237d046c30db1ebabb5a9bfcb0df46a4 /hw/lm32 | |
| parent | an5206: Don't enforce use of kernel for qtest (diff) | |
| download | qemu-c00eb5cee145ec7ff030a6bfcb98afd7285868c2.tar.gz qemu-c00eb5cee145ec7ff030a6bfcb98afd7285868c2.tar.xz qemu-c00eb5cee145ec7ff030a6bfcb98afd7285868c2.zip | |
milkymist: Suppress -kernel/-bios/-drive error for qtest
Acked-by: Michael Walle <michael@walle.cc>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/lm32')
| -rw-r--r-- | hw/lm32/milkymist.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |