| Message ID | 1442135278-25281-2-git-send-email-edgar.iglesias@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Sun, Sep 13, 2015 at 2:07 AM, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > Handle missing CPU support for EL3 gracefully. > What is the use case here? A9 and A15 should be able to not have EL3, but in this case the property should still exist but be set false. No prop should only be the case with a CPU that can't ever support EL3. Regards, Peter > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > --- > hw/cpu/a15mpcore.c | 2 +- > hw/cpu/a9mpcore.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c > index 4ef8db1..94e8cc1 100644 > --- a/hw/cpu/a15mpcore.c > +++ b/hw/cpu/a15mpcore.c > @@ -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); > } > diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c > index 7046246..869818c 100644 > --- a/hw/cpu/a9mpcore.c > +++ b/hw/cpu/a9mpcore.c > @@ -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); > > -- > 1.9.1 > >
diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c index 4ef8db1..94e8cc1 100644 --- a/hw/cpu/a15mpcore.c +++ b/hw/cpu/a15mpcore.c @@ -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); } diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index 7046246..869818c 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -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);