Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150205' into...

[qemu.git] / hw / arm / integratorcp.c

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index f1961899675264cd09fcfa8adefcd462a543a306..8c48b68a347eaae0986f81ab43f3823dcbea66f3 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -493,6 +493,18 @@ static void integratorcp_init(MachineState *machine)
 
     cpuobj = object_new(object_class_get_name(cpu_oc));
 
+    /* By default ARM1176 CPUs have EL3 enabled.  This board does not
+     * currently support EL3 so the CPU EL3 property is disabled before
+     * realization.
+     */
+    if (object_property_find(cpuobj, "has_el3", NULL)) {
+        object_property_set_bool(cpuobj, false, "has_el3", &err);
+        if (err) {
+            error_report("%s", error_get_pretty(err));
+            exit(1);
+        }
+    }
+
     object_property_set_bool(cpuobj, true, "realized", &err);
     if (err) {
         error_report("%s", error_get_pretty(err));