hw/arm: remove deprecated dtb-kaslr-seed property

Commit Message

Paolo Bonzini Sept. 5, 2024, 8:06 a.m. UTC

dtb-kaslr-seed is a deprecated alias of dtb-randomness.
After ~two years it is time to remove it.

Signed-off-by: Paolo Bonzini <[e-mail]>
---
 docs/about/deprecated.rst       | 8 --------
 docs/about/removed-features.rst | 8 ++++++++
 docs/system/arm/virt.rst        | 3 ---
 hw/arm/virt.c                   | 6 ------
 4 files changed, 8 insertions(+), 17 deletions(-)

Patch

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 2175d2eb593..3a3a1445a58 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -223,14 +223,6 @@  is a chance the code will bitrot without anyone noticing.
 System emulator machines
 ------------------------
 
-Arm ``virt`` machine ``dtb-kaslr-seed`` property (since 7.1)
-''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
-The ``dtb-kaslr-seed`` property on the ``virt`` board has been
-deprecated; use the new name ``dtb-randomness`` instead. The new name
-better reflects the way this property affects all random data within
-the device tree blob, not just the ``kaslr-seed`` node.
-
 ``pc-i440fx-2.4`` up to ``pc-i440fx-2.12`` (since 9.1)
 ''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index fc7b28e6373..5ae730d02ae 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -924,6 +924,14 @@  The m68k ``dummy`` machine (removed in 2.9)
 
 Use the ``none`` machine with the ``loader`` device instead.
 
+Arm ``virt`` machine ``dtb-kaslr-seed`` property (removed in 9.2)
+'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+The ``dtb-kaslr-seed`` property on the ``virt`` board has been
+deprecated; use the new name ``dtb-randomness`` instead. The new name
+better reflects the way this property affects all random data within
+the device tree blob, not just the ``kaslr-seed`` node.
+
 ``xlnx-ep108`` (removed in 3.0)
 '''''''''''''''''''''''''''''''
 
diff --git a/docs/system/arm/virt.rst b/docs/system/arm/virt.rst
index e67e7f0f7c5..446800c6b55 100644
--- a/docs/system/arm/virt.rst
+++ b/docs/system/arm/virt.rst
@@ -181,9 +181,6 @@  dtb-randomness
   DTB to be non-deterministic. It would be the responsibility of
   the firmware to come up with a seed and pass it on if it wants to.
 
-dtb-kaslr-seed
-  A deprecated synonym for dtb-randomness.
-
 Linux guest kernel configuration
 """"""""""""""""""""""""""""""""
 
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 687fe0bb8bc..bc9d3c15b45 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -3197,12 +3197,6 @@  static void virt_machine_class_init(ObjectClass *oc, void *data)
                                           "Set off to disable passing random or "
                                           "non-deterministic dtb nodes to guest");
 
-    object_class_property_add_bool(oc, "dtb-kaslr-seed",
-                                   virt_get_dtb_randomness,
-                                   virt_set_dtb_randomness);
-    object_class_property_set_description(oc, "dtb-kaslr-seed",
-                                          "Deprecated synonym of dtb-randomness");
-
     object_class_property_add_str(oc, "x-oem-id",
                                   virt_get_oem_id,
                                   virt_set_oem_id);