Commit 6533a1fc authored by Edgar E. Iglesias's avatar Edgar E. Iglesias Committed by Peter Maydell
Browse files

hw/cpu/{a15mpcore, a9mpcore}: Handle missing has_el3 CPU props gracefully 



Handle missing CPU support for EL3 gracefully.

Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1442135278-25281-2-git-send-email-edgar.iglesias@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 6abc7158

hw/cpu/a15mpcore.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static void a15mp_priv_realize(DeviceState *dev, Error **errp) 
         * either all the CPUs have TZ, or none do.

         */

        cpuobj = OBJECT(qemu_get_cpu(0));

        has_el3 = object_property_find(cpuobj, "has_el3", &error_abort) &&

        has_el3 = object_property_find(cpuobj, "has_el3", NULL) &&

            object_property_get_bool(cpuobj, "has_el3", &error_abort);

        qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3);

    }

hw/cpu/a9mpcore.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static void a9mp_priv_realize(DeviceState *dev, Error **errp) 
     * either all the CPUs have TZ, or none do.

     */

    cpuobj = OBJECT(qemu_get_cpu(0));

    has_el3 = object_property_find(cpuobj, "has_el3", &error_abort) &&

    has_el3 = object_property_find(cpuobj, "has_el3", NULL) &&

        object_property_get_bool(cpuobj, "has_el3", &error_abort);

    qdev_prop_set_bit(gicdev, "has-security-extensions", has_el3);