From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V70kk-0008HN-4A for qemu-devel@nongnu.org; Wed, 07 Aug 2013 06:14:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V70kf-0004Lk-AX for qemu-devel@nongnu.org; Wed, 07 Aug 2013 06:14:02 -0400 Received: from hall.aurel32.net ([2001:470:1f0b:4a8::1]:44190) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V70kf-0004Lg-3a for qemu-devel@nongnu.org; Wed, 07 Aug 2013 06:13:57 -0400 Date: Wed, 7 Aug 2013 12:13:50 +0200 From: Aurelien Jarno Message-ID: <20130807101350.GK4193@ohm.aurel32.net> References: <1375709247-10002-1-git-send-email-afaerber@suse.de> <1375709247-10002-20-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1375709247-10002-20-git-send-email-afaerber@suse.de> Subject: Re: [Qemu-devel] [PATCH for-1.6? v2 19/21] shix: Don't require firmware presence for qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?iso-8859-15?Q?F=E4rber?= Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi On Mon, Aug 05, 2013 at 03:27:25PM +0200, Andreas Färber wrote: > Adopt error_report() while at it. > > Signed-off-by: Andreas Färber > --- > hw/block/tc58128.c | 10 ++++++---- > hw/sh4/shix.c | 9 +++++---- > 2 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c > index a3929d4..728f1c3 100644 > --- a/hw/block/tc58128.c > +++ b/hw/block/tc58128.c > @@ -1,6 +1,8 @@ > #include "hw/hw.h" > #include "hw/sh4/sh.h" > #include "hw/loader.h" > +#include "sysemu/qtest.h" > +#include "qemu/error-report.h" > > #define CE1 0x0100 > #define CE2 0x0200 > @@ -36,10 +38,10 @@ static void init_dev(tc58128_dev * dev, const char *filename) > /* Load flash image skipping the first block */ > ret = load_image(filename, dev->flash_contents + 528 * 32); > if (ret < 0) { > - fprintf(stderr, "ret=%d\n", ret); > - fprintf(stderr, "qemu: could not load flash image %s\n", > - filename); > - exit(1); > + if (!qtest_enabled()) { > + error_report("Could not load flash image %s", filename); > + exit(1); > + } > } else { > /* Build first block with number of blocks */ > blocks = (ret + 528 * 32 - 1) / (528 * 32); > diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c > index 66cbea4..5ee7af6 100644 > --- a/hw/sh4/shix.c > +++ b/hw/sh4/shix.c > @@ -30,9 +30,11 @@ > #include "hw/hw.h" > #include "hw/sh4/sh.h" > #include "sysemu/sysemu.h" > +#include "sysemu/qtest.h" > #include "hw/boards.h" > #include "hw/loader.h" > #include "exec/address-spaces.h" > +#include "qemu/error-report.h" > > #define BIOS_FILENAME "shix_bios.bin" > #define BIOS_ADDRESS 0xA0000000 > @@ -72,10 +74,9 @@ static void shix_init(QEMUMachineInitArgs *args) > if (bios_name == NULL) > bios_name = BIOS_FILENAME; > ret = load_image_targphys(bios_name, 0, 0x4000); > - if (ret < 0) { /* Check bios size */ > - fprintf(stderr, "qemu: could not load SHIX bios '%s'\n", > - bios_name); > - exit(1); > + if (ret < 0 && !qtest_enabled()) { > + error_report("Could not load SHIX bios '%s'", bios_name); > + exit(1); > } > > /* Register peripherals */ Reviewed-by: Aurelien Jarno -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net