This removes conflict with the same function from target/arm. To the opposite of arm target, there is no external caller for this function.
Signed-off-by: Pierrick Bouvier <[email protected]> --- hw/riscv/virt.c | 10 +++++----- include/hw/riscv/virt.h | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d4b501802f6..b53ae07f9b9 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -71,6 +71,11 @@ static bool virt_use_kvm_aia_aplic_imsic(RISCVVirtAIAType aia_type) return riscv_is_kvm_aia_aplic_imsic(msimode); } +static bool virt_is_acpi_enabled(RISCVVirtState *s) +{ + return s->acpi != ON_OFF_AUTO_OFF; +} + static bool virt_use_emulated_aplic(RISCVVirtAIAType aia_type) { bool msimode = aia_type == VIRT_AIA_TYPE_APLIC_IMSIC; @@ -1066,11 +1071,6 @@ static void virt_set_iommu_sys(Object *obj, Visitor *v, const char *name, visit_type_OnOffAuto(v, name, &s->iommu_sys, errp); } -bool virt_is_acpi_enabled(RISCVVirtState *s) -{ - return s->acpi != ON_OFF_AUTO_OFF; -} - static void virt_get_acpi(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index e516898f9ad..16d86edfcfc 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -121,7 +121,6 @@ enum { #define VIRT_PLIC_SIZE(__num_context) \ (VIRT_PLIC_CONTEXT_BASE + (__num_context) * VIRT_PLIC_CONTEXT_STRIDE) -bool virt_is_acpi_enabled(RISCVVirtState *s); bool virt_is_iommu_sys_enabled(RISCVVirtState *s); void virt_acpi_setup(RISCVVirtState *vms); -- 2.47.3
