From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51988) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r34-0006hT-2P for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:16:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3r2x-0003yb-Ay for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:15:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:48943 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3r2w-0003xg-VN for qemu-devel@nongnu.org; Mon, 29 Jul 2013 13:15:47 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 19:15:32 +0200 Message-Id: <1375118141-8550-6-git-send-email-afaerber@suse.de> In-Reply-To: <1375118141-8550-1-git-send-email-afaerber@suse.de> References: <1375118141-8550-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-1.6? 05/14] z2: Don't enforce use of -pflash for qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws, Paul Brook Signed-off-by: Andreas F=C3=A4rber --- hw/arm/z2.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/hw/arm/z2.c b/hw/arm/z2.c index 07a127b..e32efc0 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" =20 #ifdef DEBUG_Z2 #define DPRINTF(fmt, ...) \ @@ -323,19 +324,21 @@ static void z2_init(QEMUMachineInitArgs *args) be =3D 0; #endif dinfo =3D 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); } =20 - if (!pflash_cfi01_register(Z2_FLASH_BASE, - NULL, "z2.flash0", Z2_FLASH_SIZE, - dinfo->bdrv, sector_len, - Z2_FLASH_SIZE / sector_len, 4, 0, 0, 0, 0= , - be)) { - fprintf(stderr, "qemu: Error registering flash memory.\n"); - exit(1); + if (dinfo) { + if (!pflash_cfi01_register(Z2_FLASH_BASE, + NULL, "z2.flash0", Z2_FLASH_SIZE, + dinfo->bdrv, sector_len, + Z2_FLASH_SIZE / sector_len, 4, 0, 0, = 0, 0, + be)) { + fprintf(stderr, "qemu: Error registering flash memory.\n"); + exit(1); + } } =20 /* setup keypad */ --=20 1.8.1.4