[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/13] acpi: simplify build_isa_devices_aml()
From: |
Gerd Hoffmann |
Subject: |
[PATCH v4 11/13] acpi: simplify build_isa_devices_aml() |
Date: |
Tue, 5 May 2020 13:38:41 +0200 |
x86 machines can have a single ISA bus only.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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);
}
--
2.18.4
- [PATCH v4 00/13] acpi: i386 tweaks, Gerd Hoffmann, 2020/05/05
- [PATCH v4 04/13] acpi: serial: don't use _STA method, Gerd Hoffmann, 2020/05/05
- [PATCH v4 11/13] acpi: simplify build_isa_devices_aml(),
Gerd Hoffmann <=
- [PATCH v4 06/13] acpi: parallel: don't use _STA method, Gerd Hoffmann, 2020/05/05
- [PATCH v4 12/13] acpi: drop serial/parallel enable bits from dsdt, Gerd Hoffmann, 2020/05/05
- [PATCH v4 09/13] acpi: move aml builder code for i8042 (kbd+mouse) device, Gerd Hoffmann, 2020/05/05
- [PATCH v4 10/13] acpi: factor out fw_cfg_add_acpi_dsdt(), Gerd Hoffmann, 2020/05/05
- [PATCH v4 13/13] floppy: make isa_fdc_get_drive_max_chs static, Gerd Hoffmann, 2020/05/05
- [PATCH v4 05/13] acpi: move aml builder code for serial device, Gerd Hoffmann, 2020/05/05