mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-25 11:28:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

target-arm: Add virt machine secure property

Browse source 
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 disable
security extensions on a -kernel Linux boot:

aarch64-softmmu/qemu-system-aarch64
-machine type=virt,secure=off
-kernel ...

Backports commit 083a58906cb32731dd98a93fcf451ec7718c0924 from qemu
This commit is contained in:
Greg Bellows 2018-03-11 14:06:47 -04:00 committed by Lioncash
parent 125bd964d9
commit 655b780f48
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
qemu/hw/arm/virt.c
View file

@ -47,6 +47,7 @@ typedef struct {
typedef struct {
MachineState parent;
bool secure;
} VirtMachineState;
#define TYPE_VIRT_MACHINE "virt"
@ -83,6 +84,38 @@ static int machvirt_init(struct uc_struct *uc, MachineState *machine)
return 0;
}
static QEMU_UNUSED_FUNC bool virt_get_secure(struct uc_struct *uc, Object *obj, Error **errp)
{
VirtMachineState *vms = VIRT_MACHINE(uc, obj);
return vms->secure;
}
static QEMU_UNUSED_FUNC int virt_set_secure(struct uc_struct *uc, Object *obj, bool value, Error **errp)
{
VirtMachineState *vms = VIRT_MACHINE(uc, obj);
vms->secure = value;
return 0;
}
static void virt_instance_init(struct uc_struct *uc, Object *obj, void *opaque)
{
VirtMachineState *vms = VIRT_MACHINE(uc, obj);
/* EL3 is enabled by default on virt */
vms->secure = true;
/* Unicorn: should be uncommented, but causes linkage errors :/
object_property_add_bool(uc, obj, "secure", virt_get_secure,
virt_set_secure, NULL);
object_property_set_description(uc, obj, "secure",
"Set on/off to enable/disable the ARM "
"Security Extensions (TrustZone)",
NULL);
*/
}
static void virt_class_init(struct uc_struct *uc, ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(uc, oc);
@ -102,7 +135,7 @@ static const TypeInfo machvirt_info = {
sizeof(VirtMachineState),
NULL,
NULL,
virt_instance_init,
NULL,
NULL,