projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5efe843
)
mcf5208: Don't enforce use of kernel for qtest
author
Andreas Färber
<afaerber@suse.de>
Mon, 29 Jul 2013 16:47:21 +0000
(18:47 +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/mcf5208.c
patch
|
blob
|
history
diff --git
a/hw/m68k/mcf5208.c
b/hw/m68k/mcf5208.c
index fb96fe8548461d08902ce8386ccc1c78d7d41c69..6e30c0b39311c375892b431727f36bf4571c213d 100644
(file)
--- 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);
}