projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c12762
)
an5206: Don't enforce use of kernel for qtest
author
Andreas Färber
<afaerber@suse.de>
Mon, 29 Jul 2013 16:48:58 +0000
(18:48 +0200)
committer
Andreas Färber
<afaerber@suse.de>
Tue, 5 Nov 2013 16:47:29 +0000
(17:47 +0100)
Signed-off-by: Andreas Färber <afaerber@suse.de>
hw/m68k/an5206.c
patch
|
blob
|
history
diff --git
a/hw/m68k/an5206.c
b/hw/m68k/an5206.c
index a8eee44e621eb3449d1979459d8027a2016ece96..24f20685594d8ea1c65c1167869c015c78ceed00 100644
(file)
--- a/
hw/m68k/an5206.c
+++ b/
hw/m68k/an5206.c
@@
-12,6
+12,7
@@
#include "hw/loader.h"
#include "elf.h"
#include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
#define KERNEL_LOAD_ADDR 0x10000
#define AN5206_MBAR_ADDR 0x10000000
@@
-62,6
+63,9
@@
static void an5206_init(QEMUMachineInitArgs *args)
/* Load kernel. */
if (!kernel_filename) {
+ if (qtest_enabled()) {
+ return;
+ }
fprintf(stderr, "Kernel image must be specified\n");
exit(1);
}