The "riscv,delegate" DT property was added in QEMU 7.0 as part of the AIA APLIC support. The property changed name during the review process in Linux and the correct name ended up being "riscv,delegation". The incorrect name was added as alias, and deprecated in v9.1 (commit 38facfa8432), so can be removed for v11.0. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- Binary file pc-bios/opensbi-riscv32-generic-fw_dynamic.bin matches Binary file pc-bios/opensbi-riscv64-generic-fw_dynamic.bin matches --- docs/about/deprecated.rst | 11 ----------- docs/about/removed-features.rst | 11 +++++++++++ hw/riscv/virt.c | 9 --------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 1d5c4f3707c..cc5502e5394 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -494,17 +494,6 @@ versions, aliases will point to newer CPU model versions depending on the machine type, so management software must resolve CPU model aliases before starting a virtual machine. -RISC-V "virt" board "riscv,delegate" DT property (since 9.1) -'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' - -The "riscv,delegate" DT property was added in QEMU 7.0 as part of -the AIA APLIC support. The property changed name during the review -process in Linux and the correct name ended up being -"riscv,delegation". Changing the DT property name will break all -available firmwares that are using the current (wrong) name. The -property is kept as is in 9.1, together with "riscv,delegation", to -give more time for firmware developers to change their code. - x86 "isapc" board use of modern x86 CPUs (since 10.2) ''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst index 41bec8b8e38..0a62e87ee35 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -1232,6 +1232,17 @@ converting to using TCG plugins they should contact the qemu-devel mailing list. +Firmware, ACPI, Device Tree +--------------------------- + +RISC-V "virt" board "riscv,delegate" DT property (removed in 11.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The "riscv,delegate" DT property was added in QEMU 7.0 as part of +the AIA APLIC support. The property changed name during the review +process in Linux and the correct name ended up being "riscv,delegation". + + System emulator devices ----------------------- diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index bbce2fb6671..a1c323e66df 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -666,15 +666,6 @@ static void create_fdt_one_aplic(RISCVVirtState *s, int socket, qemu_fdt_setprop_cells(ms->fdt, aplic_name, "riscv,delegation", aplic_child_phandle, 0x1, VIRT_IRQCHIP_NUM_SOURCES); - /* - * DEPRECATED_9.1: Compat property kept temporarily - * to allow old firmwares to work with AIA. Do *not* - * use 'riscv,delegate' in new code: use - * 'riscv,delegation' instead. - */ - qemu_fdt_setprop_cells(ms->fdt, aplic_name, "riscv,delegate", - aplic_child_phandle, 0x1, - VIRT_IRQCHIP_NUM_SOURCES); } riscv_socket_fdt_write_id(ms, aplic_name, socket); -- 2.52.0