aboutsummaryrefslogtreecommitdiff
path: root/hw/cris
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-29 18:40:20 +0200
committerAndreas Färber <afaerber@suse.de>2013-11-05 17:47:29 +0100
commit5efe843a9a0e049d3d2a13411b7df7d3a430540c (patch)
treee2a7d13b8325be43c422fe915a231a83e31f01d8 /hw/cris
parent5633b90ad44f08a57c44bb602cb0ae6668420ac9 (diff)
axis_dev88: Don't enforce use of kernel for qtest
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/cris')
-rw-r--r--hw/cris/axis_dev88.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 03058d3bc5..55240886f5 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 = {