[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/19] acpi: simplify build_isa_devices_aml()
From: |
Michael S. Tsirkin |
Subject: |
[PULL 08/19] acpi: simplify build_isa_devices_aml() |
Date: |
Wed, 24 Jun 2020 19:06:49 -0400 |
From: Gerd Hoffmann <kraxel@redhat.com>
x86 machines can have a single ISA bus only.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200619091905.21676-9-kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/acpi-build.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 19e9c298dc..d27cecc877 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -979,18 +979,14 @@ static void build_isa_devices_aml(Aml *table)
{
VMBusBridge *vmbus_bridge = vmbus_bridge_find();
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);
if (vmbus_bridge) {
aml_append(scope, build_vmbus_device_aml(vmbus_bridge));
--
MST
- [PULL 00/19] virtio,acpi,pci: fixes, cleanups, tools., Michael S. Tsirkin, 2020/06/24
- [PULL 02/19] acpi: bios-tables-test: show more context on asl diffs, Michael S. Tsirkin, 2020/06/24
- [PULL 04/19] floppy: make isa_fdc_get_drive_max_chs static, Michael S. Tsirkin, 2020/06/24
- [PULL 01/19] qtest: allow DSDT acpi table changes, Michael S. Tsirkin, 2020/06/24
- [PULL 03/19] acpi: move aml builder code for floppy device, Michael S. Tsirkin, 2020/06/24
- [PULL 05/19] floppy: move cmos_get_fd_drive_type() from pc, Michael S. Tsirkin, 2020/06/24
- [PULL 06/19] acpi: move aml builder code for i8042 (kbd+mouse) device, Michael S. Tsirkin, 2020/06/24
- [PULL 07/19] acpi: factor out fw_cfg_add_acpi_dsdt(), Michael S. Tsirkin, 2020/06/24
- [PULL 08/19] acpi: simplify build_isa_devices_aml(),
Michael S. Tsirkin <=
- [PULL 09/19] acpi: drop serial/parallel enable bits from dsdt, Michael S. Tsirkin, 2020/06/24
- [PULL 10/19] acpi: drop build_piix4_pm(), Michael S. Tsirkin, 2020/06/24
- [PULL 11/19] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion., Michael S. Tsirkin, 2020/06/24
- [PULL 12/19] tests/acpi: update expected data files, Michael S. Tsirkin, 2020/06/24
- [PULL 14/19] arm/acpi: Add the TPM2.0 device under the DSDT, Michael S. Tsirkin, 2020/06/24
- [PULL 13/19] acpi: Some build_tpm2() code reshape, Michael S. Tsirkin, 2020/06/24
- [PULL 16/19] Stop vhost-user sending uninitialized mmap_offsets, Michael S. Tsirkin, 2020/06/24
- [PULL 15/19] docs/specs/tpm: ACPI boot now supported for TPM/ARM, Michael S. Tsirkin, 2020/06/24
- [PULL 17/19] Rename use_acpi_pci_hotplug to more appropriate use_acpi_hotplug_bridge, Michael S. Tsirkin, 2020/06/24
- [PULL 18/19] tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled, Michael S. Tsirkin, 2020/06/24