ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/riscv/virt.c: change 'aclint' TCG check 

The 'aclint' property is being conditioned with tcg acceleration in
virt_machine_class_init(). But acceleration code starts later than the
class init of the board, meaning that tcg_enabled() will be always be
false during class_init(), and the option is never being declared even
when declaring TCG accel:

$ ./build/qemu-system-riscv64 -M virt,accel=tcg,aclint=on
qemu-system-riscv64: Property 'virt-machine.aclint' not found

Fix it by moving the check from class_init() to machine_init(). Tune the
description to mention that the option is TCG only.

Cc: Philippe Mathieu-Daudé <philmd@linaro.org>
Fixes: c0716c81b ("hw/riscv/virt: Restrict ACLINT to TCG")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1823
Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230811160224.440697-2-dbarboza@ventanamicro.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Daniel Henrique Barboza 2023-08-11 13:02:24 -03:00 committed by Alistair Francis
parent 136cb9cc03
commit b274c2388e
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/riscv/virt.c
View File

@ -1350,6 +1350,11 @@ static void virt_machine_init(MachineState *machine)
exit(1); exit(1);
} }
if (!tcg_enabled() && s->have_aclint) {
error_report("'aclint' is only available with TCG acceleration");
exit(1);
}
/* Initialize sockets */ /* Initialize sockets */
mmio_irqchip = virtio_irqchip = pcie_irqchip = NULL; mmio_irqchip = virtio_irqchip = pcie_irqchip = NULL;
for (i = 0; i < socket_count; i++) { for (i = 0; i < socket_count; i++) {
@ -1683,13 +1688,14 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS); machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
#endif #endif
if (tcg_enabled()) {
object_class_property_add_bool(oc, "aclint", virt_get_aclint, object_class_property_add_bool(oc, "aclint", virt_get_aclint,
virt_set_aclint); virt_set_aclint);
object_class_property_set_description(oc, "aclint", object_class_property_set_description(oc, "aclint",
"Set on/off to enable/disable " "(TCG only) Set on/off to "
"emulating ACLINT devices"); "enable/disable emulating "
} "ACLINT devices");
object_class_property_add_str(oc, "aia", virt_get_aia, object_class_property_add_str(oc, "aia", virt_get_aia,
virt_set_aia); virt_set_aia);
object_class_property_set_description(oc, "aia", object_class_property_set_description(oc, "aia",