ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Igor Mammedov 2018-02-28 15:23:47 +01:00 committed by Michael S. Tsirkin
parent 13b1881aac
commit 697155cdf1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/acpi-build.c
View File

@ -128,7 +128,7 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
{ {
Object *piix = piix4_pm_find(); Object *piix = piix4_pm_find();
Object *lpc = ich9_lpc_find(); Object *lpc = ich9_lpc_find();
Object *obj = NULL; Object *obj = piix ? piix : lpc;
QObject *o; QObject *o;
pm->force_rev1_fadt = false; pm->force_rev1_fadt = false;
@ -138,7 +138,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
if (piix) { if (piix) {
/* w2k requires FADT(rev1) or it won't boot, keep PC compatible */ /* w2k requires FADT(rev1) or it won't boot, keep PC compatible */
pm->force_rev1_fadt = true; pm->force_rev1_fadt = true;
obj = piix;
pm->cpu_hp_io_base = PIIX4_CPU_HOTPLUG_IO_BASE; pm->cpu_hp_io_base = PIIX4_CPU_HOTPLUG_IO_BASE;
pm->pcihp_io_base = pm->pcihp_io_base =
object_property_get_uint(obj, ACPI_PCIHP_IO_BASE_PROP, NULL); 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); object_property_get_uint(obj, ACPI_PCIHP_IO_LEN_PROP, NULL);
} }
if (lpc) { if (lpc) {
obj = lpc;
pm->cpu_hp_io_base = ICH9_CPU_HOTPLUG_IO_BASE; pm->cpu_hp_io_base = ICH9_CPU_HOTPLUG_IO_BASE;
} }
assert(obj); assert(obj);