|
@@ -247,11 +247,15 @@ static void create_fdt(VirtMachineState *vms)
|
|
|
|
|
|
/* /chosen must exist for load_dtb to fill in necessary properties later */
|
|
|
qemu_fdt_add_subnode(fdt, "/chosen");
|
|
|
- create_kaslr_seed(ms, "/chosen");
|
|
|
+ if (vms->dtb_kaslr_seed) {
|
|
|
+ create_kaslr_seed(ms, "/chosen");
|
|
|
+ }
|
|
|
|
|
|
if (vms->secure) {
|
|
|
qemu_fdt_add_subnode(fdt, "/secure-chosen");
|
|
|
- create_kaslr_seed(ms, "/secure-chosen");
|
|
|
+ if (vms->dtb_kaslr_seed) {
|
|
|
+ create_kaslr_seed(ms, "/secure-chosen");
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/* Clock node, for the benefit of the UART. The kernel device tree
|
|
@@ -2235,6 +2239,20 @@ static void virt_set_its(Object *obj, bool value, Error **errp)
|
|
|
vms->its = value;
|
|
|
}
|
|
|
|
|
|
+static bool virt_get_dtb_kaslr_seed(Object *obj, Error **errp)
|
|
|
+{
|
|
|
+ VirtMachineState *vms = VIRT_MACHINE(obj);
|
|
|
+
|
|
|
+ return vms->dtb_kaslr_seed;
|
|
|
+}
|
|
|
+
|
|
|
+static void virt_set_dtb_kaslr_seed(Object *obj, bool value, Error **errp)
|
|
|
+{
|
|
|
+ VirtMachineState *vms = VIRT_MACHINE(obj);
|
|
|
+
|
|
|
+ vms->dtb_kaslr_seed = value;
|
|
|
+}
|
|
|
+
|
|
|
static char *virt_get_oem_id(Object *obj, Error **errp)
|
|
|
{
|
|
|
VirtMachineState *vms = VIRT_MACHINE(obj);
|
|
@@ -2764,6 +2782,13 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
|
|
|
"Set on/off to enable/disable "
|
|
|
"ITS instantiation");
|
|
|
|
|
|
+ object_class_property_add_bool(oc, "dtb-kaslr-seed",
|
|
|
+ virt_get_dtb_kaslr_seed,
|
|
|
+ virt_set_dtb_kaslr_seed);
|
|
|
+ object_class_property_set_description(oc, "dtb-kaslr-seed",
|
|
|
+ "Set off to disable passing of kaslr-seed "
|
|
|
+ "dtb node to guest");
|
|
|
+
|
|
|
object_class_property_add_str(oc, "x-oem-id",
|
|
|
virt_get_oem_id,
|
|
|
virt_set_oem_id);
|
|
@@ -2828,6 +2853,9 @@ static void virt_instance_init(Object *obj)
|
|
|
/* MTE is disabled by default. */
|
|
|
vms->mte = false;
|
|
|
|
|
|
+ /* Supply a kaslr-seed by default */
|
|
|
+ vms->dtb_kaslr_seed = true;
|
|
|
+
|
|
|
vms->irqmap = a15irqmap;
|
|
|
|
|
|
virt_flash_create(vms);
|