@@ -93,6 +93,7 @@ typedef struct {
typedef struct {
MachineState parent;
+ bool secure;
} VirtMachineState;
#define TYPE_VIRT_MACHINE "virt"
@@ -632,6 +633,40 @@ 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);
+
+ /* Determine whether to start in a secure state or non-secure state based
+ * on whether we are directly booting a kernel ("-kernel" option). If we
+ * are, then we default to booting into non-secure state. Otherwise, we
+ * default to the machine default which is secure EL1/SVC.
+ * This may be overridden by the "secure" machine property.
+ */
+ if (qemu_opt_get(qemu_get_machine_opts(), "kernel")) {
+ vms->secure = false;
+ } else {
+ vms->secure = true;
+ }
+
+ object_property_add_bool(obj, "secure", virt_get_secure,
+ virt_set_secure, NULL);
+}
+
static void virt_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -646,6 +681,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> --- hw/arm/virt.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+)