[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/58] axis_dev88: Don't enforce use of kernel for qt
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 12/58] axis_dev88: Don't enforce use of kernel for qtest |
Date: |
Tue, 8 Oct 2013 19:44:10 +0200 |
Reviewed-by: Edgar E. Iglesias <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/cris/axis_dev88.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 03058d3..5524088 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -32,6 +32,7 @@
#include "boot.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
#define D(x)
#define DNAND(x)
@@ -340,14 +341,14 @@ void axisdev88_init(QEMUMachineInitArgs *args)
irq[0x14 + i]);
}
- if (!kernel_filename) {
+ if (kernel_filename) {
+ li.image_filename = kernel_filename;
+ li.cmdline = kernel_cmdline;
+ cris_load_image(cpu, &li);
+ } else if (!qtest_enabled()) {
fprintf(stderr, "Kernel image must be specified\n");
exit(1);
}
-
- li.image_filename = kernel_filename;
- li.cmdline = kernel_cmdline;
- cris_load_image(cpu, &li);
}
static QEMUMachine axisdev88_machine = {
--
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 <=
- [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, 2013/10/08
- [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