diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-07-29 17:12:41 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-11-05 17:47:28 +0100 |
| commit | d2f7c496c32476bb5eff616f6fda293393d70740 (patch) | |
| tree | 80ba36bb1402766d81ffd44da4dd16cedf89fb59 /hw/arm/mainstone.c | |
| parent | f741a26c126448adebee7b85fc87b72176c3dfa5 (diff) | |
| download | qemu-d2f7c496c32476bb5eff616f6fda293393d70740.zip qemu-d2f7c496c32476bb5eff616f6fda293393d70740.tar.gz qemu-d2f7c496c32476bb5eff616f6fda293393d70740.tar.bz2 | |
mainstone: Don't enforce use of -pflash for qtest
Simply skip flash setup for now.
Also drop useless debug output.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/arm/mainstone.c')
| -rw-r--r-- | hw/arm/mainstone.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c index b244f7e..9402c84 100644 --- a/hw/arm/mainstone.c +++ b/hw/arm/mainstone.c @@ -21,6 +21,7 @@ #include "sysemu/blockdev.h" #include "hw/sysbus.h" #include "exec/address-spaces.h" +#include "sysemu/qtest.h" /* Device addresses */ #define MST_FPGA_PHYS 0x08000000 @@ -127,6 +128,9 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, for (i = 0; i < 2; i ++) { dinfo = drive_get(IF_PFLASH, 0, i); if (!dinfo) { + if (qtest_enabled()) { + break; + } fprintf(stderr, "Two flash images must be given with the " "'pflash' parameter\n"); exit(1); @@ -147,7 +151,6 @@ static void mainstone_common_init(MemoryRegion *address_space_mem, qdev_get_gpio_in(mpu->gpio, 0)); /* setup keypad */ - printf("map addr %p\n", &map); pxa27x_register_keypad(mpu->kp, map, 0xe0); /* MMC/SD host */ |