summaryrefslogtreecommitdiff
path: root/hw/sparc
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-08-04 17:58:58 +0200
committerAndreas Färber <afaerber@suse.de>2013-11-05 17:47:29 +0100
commit7761254120905cb2c5c435246f97e51968ddddec (patch)
tree3fec9fe80afdbc72b15277546076afa887c589df /hw/sparc
parentd32f7d2506f1dab996e977e478f19baff5d47b51 (diff)
downloadqemu-7761254120905cb2c5c435246f97e51968ddddec.tar.gz
leon3: Don't enforce use of -bios with qtest
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/sparc')
-rw-r--r--hw/sparc/leon3.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 390f3e4bda..c583c3d0c5 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -26,6 +26,7 @@
#include "hw/ptimer.h"
#include "sysemu/char.h"
#include "sysemu/sysemu.h"
+#include "sysemu/qtest.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
@@ -178,7 +179,7 @@ static void leon3_generic_hw_init(QEMUMachineInitArgs *args)
fprintf(stderr, "qemu: could not load prom '%s'\n", filename);
exit(1);
}
- } else if (kernel_filename == NULL) {
+ } else if (kernel_filename == NULL && !qtest_enabled()) {
fprintf(stderr, "Can't read bios image %s\n", filename);
exit(1);
}