Commit 697155cd authored by Igor Mammedov's avatar Igor Mammedov Committed by Michael S. Tsirkin
Browse files

pc: replace pm object initialization with one-liner in acpi_get_pm_info() 



next patch will need it before it gets to piix4/lpc branches
that initializes 'obj' now.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 13b1881a

hw/i386/acpi-build.c

+1 −3
Original line number Diff line number Diff line
@@ -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);