From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 4 Apr 2014 16:42:33 +0000 (+0100)
Subject: hw/arm/highbank: Don't segfault on unknown CPU names
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3b418d0c45fccd850f9ad9eb4bf9bdcd96b8e6f7;p=qemu.git

hw/arm/highbank: Don't segfault on unknown CPU names

If the user passes an unknown CPU name via the '-cpu' option, exit
with an error message rather than segfaulting.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Rob Herring <rob.herring@linaro.org>
---

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index f66d57b113..2a88b843e9 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -233,6 +233,11 @@ static void calxeda_init(QEMUMachineInitArgs *args, enum cxmachines machine)
         ARMCPU *cpu;
         Error *err = NULL;
 
+        if (!oc) {
+            error_report("Unable to find CPU definition");
+            exit(1);
+        }
+
         cpu = ARM_CPU(object_new(object_class_get_name(oc)));
 
         object_property_set_int(OBJECT(cpu), MPCORE_PERIPHBASE, "reset-cbar",