| Message ID | 1418340569-30519-8-git-send-email-greg.bellows@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 11 December 2014 at 23:29, Greg Bellows <greg.bellows@linaro.org> wrote: > Add "secure" virt machine specific property to allow override of the > default secure state configuration. By default, when using the QEMU > -kernel command line argument, virt machines boot into NS/SVC. When using > the QEMU -bios command line argument, virt machines boot into S/SVC. > > The secure state can be changed from the default specifying the secure > state as a machine property. For example, the below command line would > enable secure state on a -linux boot: > > aarch64-softmmu/qemu-system-aarch64 > -machine type=virt,secure=on > -kernel ... Example sets the property to its default value again. > > Signed-off-by: Greg Bellows <greg.bellows@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On 15 December 2014 at 11:12, Peter Maydell <peter.maydell@linaro.org> wrote: > > On 11 December 2014 at 23:29, Greg Bellows <greg.bellows@linaro.org> > wrote: > > Add "secure" virt machine specific property to allow override of the > > default secure state configuration. By default, when using the QEMU > > -kernel command line argument, virt machines boot into NS/SVC. When > using > > the QEMU -bios command line argument, virt machines boot into S/SVC. > > > > The secure state can be changed from the default specifying the secure > > state as a machine property. For example, the below command line would > > enable secure state on a -linux boot: > > > > aarch64-softmmu/qemu-system-aarch64 > > -machine type=virt,secure=on > > -kernel ... > > Example sets the property to its default value again. > > Fixed. > > > > Signed-off-by: Greg Bellows <greg.bellows@linaro.org> > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > > thanks > -- PMM >
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index b6bb914..3eacc43 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -93,6 +93,7 @@ typedef struct { typedef struct { MachineState parent; + bool secure; } VirtMachineState; #define TYPE_VIRT_MACHINE "virt" @@ -632,6 +633,33 @@ static void machvirt_init(MachineState *machine) arm_load_kernel(ARM_CPU(first_cpu), &vbi->bootinfo); } +static bool virt_get_secure(Object *obj, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + return vms->secure; +} + +static void virt_set_secure(Object *obj, bool value, Error **errp) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + vms->secure = value; +} + +static void virt_instance_init(Object *obj) +{ + VirtMachineState *vms = VIRT_MACHINE(obj); + + /* EL3 is enabled by default on virt */ + vms->secure = true; + object_property_add_bool(obj, "secure", virt_get_secure, + virt_set_secure, NULL); + object_property_set_description(obj, "secure", + "Set on/off to enable/disable secure state", + NULL); +} + static void virt_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -646,6 +674,7 @@ static const TypeInfo machvirt_info = { .name = TYPE_VIRT_MACHINE, .parent = TYPE_MACHINE, .instance_size = sizeof(VirtMachineState), + .instance_init = virt_instance_init, .class_size = sizeof(VirtMachineClass), .class_init = virt_class_init, };
Add "secure" virt machine specific property to allow override of the default secure state configuration. By default, when using the QEMU -kernel command line argument, virt machines boot into NS/SVC. When using the QEMU -bios command line argument, virt machines boot into S/SVC. The secure state can be changed from the default specifying the secure state as a machine property. For example, the below command line would enable secure state on a -linux boot: aarch64-softmmu/qemu-system-aarch64 -machine type=virt,secure=on -kernel ... Signed-off-by: Greg Bellows <greg.bellows@linaro.org> --- v1 -> v2 - Adapt the machine secure property to Marcel's new dynamic registration - Change the default machine secure property to true (on). --- hw/arm/virt.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)