From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39282)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <edgar.iglesias@gmail.com>) id 1VOApy-0004D1-Hf
	for qemu-devel@nongnu.org; Mon, 23 Sep 2013 14:26:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <edgar.iglesias@gmail.com>) id 1VOAps-0002Ly-Vs
	for qemu-devel@nongnu.org; Mon, 23 Sep 2013 14:26:22 -0400
Received: from mail-la0-x233.google.com ([2a00:1450:4010:c03::233]:55390)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <edgar.iglesias@gmail.com>) id 1VOAps-0002Ls-Nl
	for qemu-devel@nongnu.org; Mon, 23 Sep 2013 14:26:16 -0400
Received: by mail-la0-f51.google.com with SMTP id es20so2738909lab.38
	for <qemu-devel@nongnu.org>; Mon, 23 Sep 2013 11:26:15 -0700 (PDT)
Date: Mon, 23 Sep 2013 20:26:08 +0200
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Message-ID: <20130923182607.GA13159@smtp.vpn>
References: <1379943352-1979-1-git-send-email-afaerber@suse.de>
	<1379943352-1979-12-git-send-email-afaerber@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1379943352-1979-12-git-send-email-afaerber@suse.de>
Subject: Re: [Qemu-devel] [PATCH v3 11/18] axis_dev88: Don't enforce use of
 kernel 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-1?Q?F=E4rber?= <afaerber@suse.de>
Cc: qemu-devel@nongnu.org

On Mon, Sep 23, 2013 at 03:35:45PM +0200, Andreas Färber wrote:
> Signed-off-by: Andreas Färber <afaerber@suse.de>

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>

> ---
>  hw/cris/axis_dev88.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
> index 03058d3..5524088 100644
> --- a/hw/cris/axis_dev88.c
> +++ b/hw/cris/axis_dev88.c
> @@ -32,6 +32,7 @@
>  #include "boot.h"
>  #include "sysemu/blockdev.h"
>  #include "exec/address-spaces.h"
> +#include "sysemu/qtest.h"
>  
>  #define D(x)
>  #define DNAND(x)
> @@ -340,14 +341,14 @@ void axisdev88_init(QEMUMachineInitArgs *args)
>                               irq[0x14 + i]);
>      }
>  
> -    if (!kernel_filename) {
> +    if (kernel_filename) {
> +        li.image_filename = kernel_filename;
> +        li.cmdline = kernel_cmdline;
> +        cris_load_image(cpu, &li);
> +    } else if (!qtest_enabled()) {
>          fprintf(stderr, "Kernel image must be specified\n");
>          exit(1);
>      }
> -
> -    li.image_filename = kernel_filename;
> -    li.cmdline = kernel_cmdline;
> -    cris_load_image(cpu, &li);
>  }
>  
>  static QEMUMachine axisdev88_machine = {
> -- 
> 1.8.1.4
>