qemu-block
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v4 11/13] acpi: simplify build_isa_devices_aml()


From: Philippe Mathieu-Daudé
Subject: Re: [PATCH v4 11/13] acpi: simplify build_isa_devices_aml()
Date: Tue, 5 May 2020 15:29:18 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0

On 5/5/20 1:38 PM, Gerd Hoffmann wrote:
x86 machines can have a single ISA bus only.

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>


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);
  }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]