[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/58] mcf5208: Don't enforce use of kernel for qtest
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 13/58] mcf5208: Don't enforce use of kernel for qtest |
Date: |
Tue, 8 Oct 2013 19:44:11 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/m68k/mcf5208.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index fb96fe8..6e30c0b 100644
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -10,6 +10,7 @@
#include "qemu/timer.h"
#include "hw/ptimer.h"
#include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
#include "net/net.h"
#include "hw/boards.h"
#include "hw/loader.h"
@@ -267,6 +268,9 @@ static void mcf5208evb_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
- [Qemu-devel] [PULL 00/58] QOM devices patch queue 2013-10-08, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 12/58] axis_dev88: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 20/58] milkymist-uart: Use Device::realize instead of SysBusDevice::init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 38/58] arm11mpcore: Split off SCU device, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 47/58] qdev-monitor: Unref device when device_add fails, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 21/58] a9mpcore: Split off instance_init, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 03/58] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 13/58] mcf5208: Don't enforce use of kernel for qtest,
Andreas Färber <=
- [Qemu-devel] [PULL 14/58] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 22/58] arm_gic: Extract headers hw/intc/arm_gic{, _common}.h, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 53/58] qom: Add pointer to int property helpers, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 52/58] qom: Clean up struct Error references, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 01/58] hw/arm/boot: Make user not specifying a kernel not an error, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 29/58] a9mpcore: Prepare for QOM embedding, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 28/58] a9mpcore: Convert to QOM realize, Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 54/58] pxa: Fix typo "dettach", Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 02/58] hw/arm: Tidy up conditional calls to arm_load_kernel(), Andreas Färber, 2013/10/08
- [Qemu-devel] [PULL 24/58] a9scu: QOM cleanups, Andreas Färber, 2013/10/08