david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

z2: Don't enforce use of -pflash for qtest

Browse Source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-29 17:15:55 +02:00
parent bdf921d65f
commit e25ac5f662
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/arm/z2.c
View File

@ -24,6 +24,7 @@
#include "ui/console.h" #include "ui/console.h"
#include "audio/audio.h" #include "audio/audio.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/qtest.h"
#ifdef DEBUG_Z2 #ifdef DEBUG_Z2
#define DPRINTF(fmt, ...) \ #define DPRINTF(fmt, ...) \
@ -323,7 +324,7 @@ static void z2_init(QEMUMachineInitArgs *args)
be = 0; be = 0;
#endif #endif
dinfo = drive_get(IF_PFLASH, 0, 0); dinfo = drive_get(IF_PFLASH, 0, 0);
if (!dinfo) { if (!dinfo && !qtest_enabled()) {
fprintf(stderr, "Flash image must be given with the " fprintf(stderr, "Flash image must be given with the "
"'pflash' parameter\n"); "'pflash' parameter\n");
exit(1); exit(1);
@ -331,7 +332,7 @@ static void z2_init(QEMUMachineInitArgs *args)
if (!pflash_cfi01_register(Z2_FLASH_BASE, if (!pflash_cfi01_register(Z2_FLASH_BASE,
NULL, "z2.flash0", Z2_FLASH_SIZE, NULL, "z2.flash0", Z2_FLASH_SIZE,
dinfo->bdrv, sector_len, dinfo ? dinfo->bdrv : NULL, sector_len,
Z2_FLASH_SIZE / sector_len, 4, 0, 0, 0, 0, Z2_FLASH_SIZE / sector_len, 4, 0, 0, 0, 0,
be)) { be)) {
fprintf(stderr, "qemu: Error registering flash memory.\n"); fprintf(stderr, "qemu: Error registering flash memory.\n");