From: Andreas Färber <afaerber@suse.de>
Date: Mon, 29 Jul 2013 15:15:55 +0000 (+0200)
Subject: z2: Don't enforce use of -pflash for qtest
X-Git-Tag: qemu-xen-4.5.0-rc1~380^2~49
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e25ac5f66275b3f9615a6c24d7ef5625f1b49ef4;p=qemu-upstream-4.5-testing.git

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

Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index a00fcc042..d52c5019b 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -24,6 +24,7 @@
 #include "ui/console.h"
 #include "audio/audio.h"
 #include "exec/address-spaces.h"
+#include "sysemu/qtest.h"
 
 #ifdef DEBUG_Z2
 #define DPRINTF(fmt, ...) \
@@ -323,7 +324,7 @@ static void z2_init(QEMUMachineInitArgs *args)
     be = 0;
 #endif
     dinfo = drive_get(IF_PFLASH, 0, 0);
-    if (!dinfo) {
+    if (!dinfo && !qtest_enabled()) {
         fprintf(stderr, "Flash image must be given with the "
                 "'pflash' parameter\n");
         exit(1);
@@ -331,7 +332,7 @@ static void z2_init(QEMUMachineInitArgs *args)
 
     if (!pflash_cfi01_register(Z2_FLASH_BASE,
                                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,
                                be)) {
         fprintf(stderr, "qemu: Error registering flash memory.\n");