[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.6? 10/14] axis_dev88: Don't enforce use of ker
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.6? 10/14] axis_dev88: Don't enforce use of kernel for qtest |
Date: |
Mon, 29 Jul 2013 19:15:37 +0200 |
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 9104d61..6673c66 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] [PATCH for-1.6? 00/14] qtest: Test all targets, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 01/14] mips_mipssim: Silence BIOS loading warning for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 07/14] omap_sx1: Don't enforce use of kernel or flash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 10/14] axis_dev88: Don't enforce use of kernel for qtest,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.6? 12/14] mcf5208: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 03/14] mainstone: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 02/14] arm/boot: Turn arm_load_kernel() into no-op for qtest without -kernel, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 05/14] z2: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 06/14] palm: Don't enforce loading ROM or kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 09/14] armv7m: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 13/14] an5206: Don't enforce use of kernel for qtest, Andreas Färber, 2013/07/29
- [Qemu-devel] [PATCH for-1.6? 04/14] gumstix: Don't enforce use of -pflash for qtest, Andreas Färber, 2013/07/29