From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49894) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6KpD-0005Sr-Cm for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:28:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6Kp1-0000ZV-76 for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:27:51 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54411 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6Kp1-0000ZD-0H for qemu-devel@nongnu.org; Mon, 05 Aug 2013 09:27:39 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 5 Aug 2013 15:27:16 +0200 Message-Id: <1375709247-10002-11-git-send-email-afaerber@suse.de> In-Reply-To: <1375709247-10002-1-git-send-email-afaerber@suse.de> References: <1375709247-10002-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? v2 10/21] armv7m: 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: Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Adopt error_report(). Signed-off-by: Andreas F=C3=A4rber --- hw/arm/armv7m.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 82d36fb..ddbaf8c 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -11,6 +11,8 @@ #include "hw/arm/arm.h" #include "hw/loader.h" #include "elf.h" +#include "sysemu/qtest.h" +#include "qemu/error-report.h" =20 /* Bitbanded IO. Each word corresponds to a single bit. */ =20 @@ -233,21 +235,22 @@ qemu_irq *armv7m_init(MemoryRegion *address_space_m= em, big_endian =3D 0; #endif =20 - if (!kernel_filename) { + if (!kernel_filename && !qtest_enabled()) { fprintf(stderr, "Guest image must be specified (using -kernel)\n= "); exit(1); } =20 - image_size =3D load_elf(kernel_filename, NULL, NULL, &entry, &lowadd= r, - NULL, big_endian, ELF_MACHINE, 1); - if (image_size < 0) { - image_size =3D load_image_targphys(kernel_filename, 0, flash_siz= e); - lowaddr =3D 0; - } - if (image_size < 0) { - fprintf(stderr, "qemu: could not load kernel '%s'\n", - kernel_filename); - exit(1); + if (kernel_filename) { + image_size =3D load_elf(kernel_filename, NULL, NULL, &entry, &lo= waddr, + NULL, big_endian, ELF_MACHINE, 1); + if (image_size < 0) { + image_size =3D load_image_targphys(kernel_filename, 0, flash= _size); + lowaddr =3D 0; + } + if (image_size < 0) { + error_report("Could not load kernel '%s'", kernel_filename); + exit(1); + } } =20 /* Hack to map an additional page of ram at the top of the address --=20 1.8.1.4