From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37730) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbdx-00052A-VQ for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VTbdr-0007Se-Vr for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:25 -0400 Received: from cantor2.suse.de ([195.135.220.15]:42990 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VTbdr-0007SP-P8 for qemu-devel@nongnu.org; Tue, 08 Oct 2013 14:04:19 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 8 Oct 2013 19:44:10 +0200 Message-Id: <1381254296-3203-13-git-send-email-afaerber@suse.de> In-Reply-To: <1381254296-3203-1-git-send-email-afaerber@suse.de> References: <1381254296-3203-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] [PULL 12/58] axis_dev88: Don't enforce use of kernel for qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Reviewed-by: Edgar E. Iglesias Signed-off-by: Andreas F=C3=A4rber --- 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" =20 #define D(x) #define DNAND(x) @@ -340,14 +341,14 @@ void axisdev88_init(QEMUMachineInitArgs *args) irq[0x14 + i]); } =20 - if (!kernel_filename) { + if (kernel_filename) { + li.image_filename =3D kernel_filename; + li.cmdline =3D kernel_cmdline; + cris_load_image(cpu, &li); + } else if (!qtest_enabled()) { fprintf(stderr, "Kernel image must be specified\n"); exit(1); } - - li.image_filename =3D kernel_filename; - li.cmdline =3D kernel_cmdline; - cris_load_image(cpu, &li); } =20 static QEMUMachine axisdev88_machine =3D { --=20 1.8.1.4