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=microbit.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 <stefa...@redhat.com>
---
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"
#include "hw/arm/nrf51_soc.h"
@@ -28,6 +29,13 @@ typedef struct {
#define MICROBIT_MACHINE(obj) \
OBJECT_CHECK(MicrobitMachineState, obj, TYPE_MICROBIT_MACHINE)
+static void microbit_cpu_reset(void *opaque)
+{
+ ARMCPU *cpu = opaque;
+
+ cpu_reset(CPU(cpu));
+}
+
static void microbit_init(MachineState *machine)
{
MicrobitMachineState *s = MICROBIT_MACHINE(machine);
@@ -41,8 +49,13 @@ static void microbit_init(MachineState *machine)
&error_fatal);
object_property_set_bool(soc, true, "realized", &error_fatal);
- 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));
+ }
}
static void microbit_machine_class_init(ObjectClass *oc, void *data)
--
2.19.2
