On Fri, 2026-10-16 at 16:22 -0700, Pierrick Bouvier wrote: > This removes conflict with the same function from target/arm. To the > opposite of arm target, there is no external caller for this > function. > > Reviewed-by: Daniel Henrique Barboza > <[email protected]> > Signed-off-by: Pierrick Bouvier <[email protected]>
Acked-by: Alistair Francis <[email protected]> Alistair > --- > 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 894cdd97976..2c6f983f83f 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -72,6 +72,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; > @@ -1067,11 +1072,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); >
