On 10/16/2026 3:27 PM, Pierrick Bouvier wrote:
This removes conflict with same function from target/arm.
Signed-off-by: Pierrick Bouvier <[email protected]>
---
Reviewed-by: Daniel Henrique Barboza <[email protected]>
hw/riscv/virt-acpi-build.c | 2 +-
hw/riscv/virt.c | 2 +-
include/hw/riscv/virt.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c
index 0475dcb5c60..4565359e908 100644
--- a/hw/riscv/virt-acpi-build.c
+++ b/hw/riscv/virt-acpi-build.c
@@ -1021,7 +1021,7 @@ static const VMStateDescription vmstate_virt_acpi_build =
{
},
};
-void virt_acpi_setup(RISCVVirtState *s)
+void riscv_virt_acpi_setup(RISCVVirtState *s)
{
AcpiBuildTables tables;
AcpiBuildState *build_state;
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index b53ae07f9b9..220f125d56b 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -711,7 +711,7 @@ static void virt_machine_done(Notifier *notifier, void
*data)
virt_build_smbios(s);
if (virt_is_acpi_enabled(s)) {
- virt_acpi_setup(s);
+ riscv_virt_acpi_setup(s);
}
}
diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h
index 16d86edfcfc..6e4fbf4b647 100644
--- a/include/hw/riscv/virt.h
+++ b/include/hw/riscv/virt.h
@@ -122,7 +122,7 @@ enum {
(VIRT_PLIC_CONTEXT_BASE + (__num_context) * VIRT_PLIC_CONTEXT_STRIDE)
bool virt_is_iommu_sys_enabled(RISCVVirtState *s);
-void virt_acpi_setup(RISCVVirtState *vms);
+void riscv_virt_acpi_setup(RISCVVirtState *vms);
/*
* The virt machine physical address space used by some of the devices
