On Tue, 5 May 2020 13:38:41 +0200 Gerd Hoffmann <kra...@redhat.com> wrote:
> x86 machines can have a single ISA bus only. > > Signed-off-by: Gerd Hoffmann <kra...@redhat.com> Reviewed-by: Igor Mammedov <imamm...@redhat.com> > --- > hw/i386/acpi-build.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index cb3913d2ee76..1922868f3401 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1061,19 +1061,14 @@ static void build_hpet_aml(Aml *table) > static void build_isa_devices_aml(Aml *table) > { > bool ambiguous; > - > - Aml *scope = aml_scope("_SB.PCI0.ISA"); > Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); > + Aml *scope; > > - if (ambiguous) { > - error_report("Multiple ISA busses, unable to define IPMI ACPI data"); > - } else if (!obj) { > - error_report("No ISA bus, unable to define IPMI ACPI data"); > - } else { > - build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); > - isa_build_aml(ISA_BUS(obj), scope); > - } > + assert(obj && !ambiguous); > > + scope = aml_scope("_SB.PCI0.ISA"); > + build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); > + isa_build_aml(ISA_BUS(obj), scope); > aml_append(table, scope); > } >