]> git.proxmox.com Git - mirror_qemu.git/commit - hw/arm/virt.c
hw/arm/virt: Let boot.c handle PSCI enablement
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 27 Jan 2022 15:46:31 +0000 (15:46 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 8 Feb 2022 10:56:28 +0000 (10:56 +0000)
commit52c235ad7500771f790521d65fb1e19b126a6a32
tree463f7b48e90aab8bf7ef8732fa7f9cfe9c4cc143
parent9437a76e1002890fd23da841e1f5bac3f5fa0db7
hw/arm/virt: Let boot.c handle PSCI enablement

Instead of setting the CPU psci-conduit and start-powered-off
properties in the virt board code, set the arm_boot_info psci_conduit
field so that the boot.c code can do it.

This will fix a corner case where we were incorrectly enabling PSCI
emulation when booting guest code into EL3 because it was an ELF file
passed to -kernel or to the generic loader.  (EL3 guest code started
via -bios or -pflash was already being run with PSCI emulation
disabled.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Tested-by: Cédric Le Goater <clg@kaod.org>
Tested-by: Niek Linnenbank <nieklinnenbank@gmail.com>
Message-id: 20220127154639.2090164-9-peter.maydell@linaro.org
hw/arm/virt.c