From nobody Fri Nov 7 00:41:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544799261075373.55817047570304; Fri, 14 Dec 2018 06:54:21 -0800 (PST) Received: from localhost ([::1]:33933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXor5-0002Z4-NA for importer@patchew.org; Fri, 14 Dec 2018 09:54:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXop0-0000uI-Q7 for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:52:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXoox-0004ZU-Ll for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:52:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49740) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gXooo-0004UI-DP; Fri, 14 Dec 2018 09:51:58 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8822B315486E; Fri, 14 Dec 2018 14:51:56 +0000 (UTC) Received: from localhost (unknown [10.36.118.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DF485DA2A; Fri, 14 Dec 2018 14:51:52 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 14:51:52 +0000 Message-Id: <20181214145152.27250-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 14 Dec 2018 14:51:57 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] microbit: make -kernel optional X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , jim@groklearning.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Steffen Gortz , qemu-arm@nongnu.org, Joel Stanley , Stefan Hajnoczi , jusual@mail.ru Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" ARMv7M machine types support -kernel for ELF and raw image files. Microbit programs are typically in Intel HEX (.hex) format. The generic loader supports .hex files but it doesn't work as expected: $ qemu-system-arm -M microbit -device loader,file=3Dmicrobit.hex Guest image must be specified (using -kernel) This error comes from armv7m_load_kernel() but we don't have -kernel in this case. This patch makes -kernel optional since most of the time we'll want to use -device loader instead. Note that we need to register the reset handler that armv7m_load_kernel() used to register for us. Signed-off-by: Stefan Hajnoczi --- hw/arm/microbit.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c index a734e7f650..638f638792 100644 --- a/hw/arm/microbit.c +++ b/hw/arm/microbit.c @@ -14,6 +14,7 @@ #include "hw/arm/arm.h" #include "sysemu/sysemu.h" #include "exec/address-spaces.h" +#include "qemu/error-report.h" =20 #include "hw/arm/nrf51_soc.h" =20 @@ -28,6 +29,13 @@ typedef struct { #define MICROBIT_MACHINE(obj) \ OBJECT_CHECK(MicrobitMachineState, obj, TYPE_MICROBIT_MACHINE) =20 +static void microbit_cpu_reset(void *opaque) +{ + ARMCPU *cpu =3D opaque; + + cpu_reset(CPU(cpu)); +} + static void microbit_init(MachineState *machine) { MicrobitMachineState *s =3D MICROBIT_MACHINE(machine); @@ -41,8 +49,13 @@ static void microbit_init(MachineState *machine) &error_fatal); object_property_set_bool(soc, true, "realized", &error_fatal); =20 - armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, - NRF51_SOC(soc)->flash_size); + if (machine->kernel_filename) { + armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, + NRF51_SOC(soc)->flash_size); + } else { + /* armv7m_load_kernel() does this, we need to do it manually here = */ + qemu_register_reset(microbit_cpu_reset, ARM_CPU(first_cpu)); + } } =20 static void microbit_machine_class_init(ObjectClass *oc, void *data) --=20 2.19.2