From: Andreas Färber Date: Mon, 29 Jul 2013 16:24:47 +0000 (+0200) Subject: palm: Don't enforce loading ROM or kernel for qtest X-Git-Tag: qemu-xen-4.5.0-rc1~380^2~48 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1ca8334e42d84cf246db88502cebf11042df2c51;p=qemu-upstream-4.5-testing.git palm: Don't enforce loading ROM or kernel for qtest Signed-off-by: Andreas Färber --- diff --git a/hw/arm/palm.c b/hw/arm/palm.c index 0b72bbe5f..fac4f6980 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); }