aboutsummaryrefslogtreecommitdiff
path: root/hw/arm
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-07-29 18:24:47 +0200
committerAndreas Färber <afaerber@suse.de>2013-11-05 17:47:29 +0100
commit1ca8334e42d84cf246db88502cebf11042df2c51 (patch)
tree5b9c89dca5584f46e4a557e83cf9bf3878a76b70 /hw/arm
parente25ac5f66275b3f9615a6c24d7ef5625f1b49ef4 (diff)
palm: Don't enforce loading ROM or kernel for qtest
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/arm')
-rw-r--r--hw/arm/palm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 0b72bbe5fb..fac4f69807 100644
--- 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);
}