| Message ID | 20220516152610.1963435-33-imammedo@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | pc/q35: refactor ISA and SMBUS AML generation | expand |
On Mon, May 16, 2022 at 8:56 PM Igor Mammedov <imammedo@redhat.com> wrote: > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Ani Sinha <ani@anisinha.ca> > --- > hw/i386/acpi-build.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 85a7313cad..414b9240b2 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1748,16 +1748,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, > > sb_scope = aml_scope("\\_SB"); > { > - Object *pci_host; > - PCIBus *bus = NULL; > - > - pci_host = acpi_get_i386_pci_host(); > + Object *pci_host = acpi_get_i386_pci_host(); > > if (pci_host) { > - bus = PCI_HOST_BRIDGE(pci_host)->bus; > - } > - > - if (bus) { > + PCIBus *bus = PCI_HOST_BRIDGE(pci_host)->bus; > Aml *scope = aml_scope("PCI0"); > /* Scan all PCI buses. Generate tables to support hotplug. */ > build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en); > -- > 2.31.1 >
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 85a7313cad..414b9240b2 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1748,16 +1748,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, sb_scope = aml_scope("\\_SB"); { - Object *pci_host; - PCIBus *bus = NULL; - - pci_host = acpi_get_i386_pci_host(); + Object *pci_host = acpi_get_i386_pci_host(); if (pci_host) { - bus = PCI_HOST_BRIDGE(pci_host)->bus; - } - - if (bus) { + PCIBus *bus = PCI_HOST_BRIDGE(pci_host)->bus; Aml *scope = aml_scope("PCI0"); /* Scan all PCI buses. Generate tables to support hotplug. */ build_append_pci_bus_devices(scope, bus, pm->pcihp_bridge_en);
Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- hw/i386/acpi-build.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)