From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48864)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <aurelien@aurel32.net>) id 1V70jU-0006jn-3I
	for qemu-devel@nongnu.org; Wed, 07 Aug 2013 06:12:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <aurelien@aurel32.net>) id 1V70jP-000414-Co
	for qemu-devel@nongnu.org; Wed, 07 Aug 2013 06:12:44 -0400
Received: from hall.aurel32.net ([2001:470:1f0b:4a8::1]:44183)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <aurelien@aurel32.net>) id 1V70jP-0003zn-5k
	for qemu-devel@nongnu.org; Wed, 07 Aug 2013 06:12:39 -0400
Date: Wed, 7 Aug 2013 12:12:23 +0200
From: Aurelien Jarno <aurelien@aurel32.net>
Message-ID: <20130807101223.GI4193@ohm.aurel32.net>
References: <1375709247-10002-1-git-send-email-afaerber@suse.de>
	<1375709247-10002-2-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-2-git-send-email-afaerber@suse.de>
Subject: Re: [Qemu-devel] [PATCH for-1.6? v2 01/21] mips_mipssim: Silence
 BIOS loading warning for qtest
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Andreas =?iso-8859-15?Q?F=E4rber?= <afaerber@suse.de>
Cc: qemu-devel@nongnu.org

On Mon, Aug 05, 2013 at 03:27:07PM +0200, Andreas Färber wrote:
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  hw/mips/mips_mipssim.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
> index fea1a15..d8c4347 100644
> --- a/hw/mips/mips_mipssim.c
> +++ b/hw/mips/mips_mipssim.c
> @@ -37,6 +37,7 @@
>  #include "elf.h"
>  #include "hw/sysbus.h"
>  #include "exec/address-spaces.h"
> +#include "sysemu/qtest.h"
>  
>  static struct _loaderparams {
>      int ram_size;
> @@ -189,7 +190,8 @@ mips_mipssim_init(QEMUMachineInitArgs *args)
>      } else {
>          bios_size = -1;
>      }
> -    if ((bios_size < 0 || bios_size > BIOS_SIZE) && !kernel_filename) {
> +    if ((bios_size < 0 || bios_size > BIOS_SIZE) &&
> +        !kernel_filename && !qtest_enabled()) {
>          /* Bail out if we have neither a kernel image nor boot vector code. */
>          fprintf(stderr,
>                  "qemu: Warning, could not load MIPS bios '%s', and no -kernel argument was specified\n",

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net