diff options
| author | Peter Maydell | 2014-04-04 18:42:33 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-04-04 18:46:11 +0200 |
| commit | 3b418d0c45fccd850f9ad9eb4bf9bdcd96b8e6f7 (patch) | |
| tree | c45b4fedbc0271621c1cb44dee6ad72206744d93 | |
| parent | Update version for v2.0.0-rc1 release (diff) | |
| download | qemu-3b418d0c45fccd850f9ad9eb4bf9bdcd96b8e6f7.tar.gz qemu-3b418d0c45fccd850f9ad9eb4bf9bdcd96b8e6f7.tar.xz qemu-3b418d0c45fccd850f9ad9eb4bf9bdcd96b8e6f7.zip | |
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>
| -rw-r--r-- | hw/arm/highbank.c | 5 |
1 files changed, 5 insertions, 0 deletions
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", |