diff options
| author | Peter Maydell | 2018-01-25 12:45:30 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-25 12:45:30 +0100 |
| commit | c88bc3e0dbe7d460a0be723379fce63a9dc6a6f5 (patch) | |
| tree | 489796316f6abdfd9c65d64a221109ebfc351d8b /hw/arm/virt.c | |
| parent | hw/intc/arm_gic: Fix the NS view of C_BPR when C_CTRL.CBPR is 1 (diff) | |
| download | qemu-c88bc3e0dbe7d460a0be723379fce63a9dc6a6f5.tar.gz qemu-c88bc3e0dbe7d460a0be723379fce63a9dc6a6f5.tar.xz qemu-c88bc3e0dbe7d460a0be723379fce63a9dc6a6f5.zip | |
hw/arm/virt: Check that the CPU realize method succeeded
We were passing a NULL error pointer to the object_property_set_bool()
call that realizes the CPU object. This meant that we wouldn't detect
failure, and would plough blindly on to crash later trying to use a
NULL CPU object pointer. Detect errors and fail instead.
In particular, this will be necessary to detect the user error
of using "-cpu host" without "-enable-kvm" once we make the host
CPU type be registered unconditionally rather than only in
kvm_arch_init().
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/virt.c')
| -rw-r--r-- | hw/arm/virt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index a4537af400..b334c82eda 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1404,7 +1404,7 @@ static void machvirt_init(MachineState *machine) "secure-memory", &error_abort); } - object_property_set_bool(cpuobj, true, "realized", NULL); + object_property_set_bool(cpuobj, true, "realized", &error_fatal); object_unref(cpuobj); } fdt_add_timer_nodes(vms); |