projects
/
sdk
/
emulator
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e25ac5f
)
palm: Don't enforce loading ROM or kernel for qtest
author
Andreas Färber
<afaerber@suse.de>
Mon, 29 Jul 2013 16:24:47 +0000
(18:24 +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/arm/palm.c
patch
|
blob
|
history
diff --git
a/hw/arm/palm.c
b/hw/arm/palm.c
index 0b72bbe5fb9cbf32f07fa8e9ab0d80dffae2f28b..fac4f698076221274f1ed0ca2d66d5f9825316f4 100644
(file)
--- a/
hw/arm/palm.c
+++ b/
hw/arm/palm.c
@@
-19,6
+19,7
@@
#include "hw/hw.h"
#include "audio/audio.h"
#include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
@@
-255,7
+256,7
@@
static void palmte_init(QEMUMachineInitArgs *args)
}
}
- if (!rom_loaded && !kernel_filename) {
+ if (!rom_loaded && !kernel_filename
&& !qtest_enabled()
) {
fprintf(stderr, "Kernel or ROM image must be specified\n");
exit(1);
}