[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/58] leon3: Don't enforce use of -bios with qtest
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 18/58] leon3: Don't enforce use of -bios with qtest |
Date: |
Tue, 8 Oct 2013 19:44:16 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/sparc/leon3.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 390f3e4..c583c3d 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -26,6 +26,7 @@
#include "hw/ptimer.h"
#include "sysemu/char.h"
#include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
@@ -178,7 +179,7 @@ static void leon3_generic_hw_init(QEMUMachineInitArgs *args)
fprintf(stderr, "qemu: could not load prom '%s'\n", filename);
exit(1);
}
- } else if (kernel_filename == NULL) {
+ } else if (kernel_filename == NULL && !qtest_enabled()) {
fprintf(stderr, "Can't read bios image %s\n", filename);
exit(1);
}
--
1.8.1.4
- [Qemu-devel] [PULL 10/58] exynos4_boards: Silence lack of -smp 2 warning for qtest, (continued)
- [Qemu-devel] [PULL 10/58] exynos4_boards: Silence lack of -smp 2 warning for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 09/58] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 36/58] arm11mpcore: Drop unused fields, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 42/58] arm11mpcore: Convert mpcore_rirq_state to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 33/58] a15mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 44/58] arm11mpcore: Split off RealView MPCore, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 25/58] a9mpcore: Embed A9SCUState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 43/58] arm11mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 57/58] ide: Drop ide_init2_with_non_qdev_drives(), Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 27/58] a9mpcore: Embed ARMMPTimerState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 18/58] leon3: Don't enforce use of -bios with qtest,
Andreas Färber <=
- [Qemu-devel] [PULL 49/58] qdev-monitor: Avoid qdev as variable name, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 56/58] microdrive: Coding Style cleanups, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 37/58] arm11mpcore: Create container MemoryRegion in instance_init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 58/58] pcmcia/pxa2xx: QOM'ify PXA2xxPCMCIAState, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 19/58] qtest: Prepare QOM machine tests, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 50/58] qdev-monitor: Inline qdev_init() for device_add, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 48/58] qdev: Drop misleading qdev_free() function, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 11/58] armv7m: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 45/58] qdev-monitor: Clean up qdev_device_add() variable naming, Andreas Färber, 2013/10/08