[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 02/10] pc: replace pm object initialization with on
From: |
Igor Mammedov |
Subject: |
[Qemu-arm] [PATCH v2 02/10] pc: replace pm object initialization with one-liner in acpi_get_pm_info() |
Date: |
Wed, 28 Feb 2018 15:23:47 +0100 |
next patch will need it before it gets to piix4/lpc branches
that initializes 'obj' now.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/i386/acpi-build.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index deb440f..b85fefe 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -128,7 +128,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
{
Object *piix = piix4_pm_find();
Object *lpc = ich9_lpc_find();
- Object *obj = NULL;
+ Object *obj = piix ? piix : lpc;
QObject *o;
pm->force_rev1_fadt = false;
@@ -138,7 +138,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
if (piix) {
/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */
pm->force_rev1_fadt = true;
- obj = piix;
pm->cpu_hp_io_base = PIIX4_CPU_HOTPLUG_IO_BASE;
pm->pcihp_io_base =
object_property_get_uint(obj, ACPI_PCIHP_IO_BASE_PROP, NULL);
@@ -146,7 +145,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
object_property_get_uint(obj, ACPI_PCIHP_IO_LEN_PROP, NULL);
}
if (lpc) {
- obj = lpc;
pm->cpu_hp_io_base = ICH9_CPU_HOTPLUG_IO_BASE;
}
assert(obj);
--
2.7.4
- [Qemu-arm] [PATCH v2 00/10] generalize build_fadt(), Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 01/10] acpi: remove unused acpi-dsdt.aml, Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 02/10] pc: replace pm object initialization with one-liner in acpi_get_pm_info(),
Igor Mammedov <=
- [Qemu-arm] [PATCH v2 05/10] acpi: move ACPI_PORT_SMI_CMD define to header it belongs to, Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 04/10] acpi: add build_append_gas() helper for Generic Address Structure, Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 03/10] acpi: reuse AcpiGenericAddress instead of Acpi20GenericAddress, Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 09/10] virt_arm: acpi: reuse common build_fadt(), Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 10/10] tests: acpi: don't read all fields in test_acpi_fadt_table(), Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 07/10] pc: acpi: use build_append_foo() API to construct FADT, Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 08/10] acpi: move build_fadt() from i386 specific to generic ACPI source, Igor Mammedov, 2018/02/28
- [Qemu-arm] [PATCH v2 06/10] pc: acpi: isolate FADT specific data into AcpiFadtData structure, Igor Mammedov, 2018/02/28