On Fri, Jun 30, 2017 at 12:56:00AM +0300, Aleksandr Bezzubikov wrote:
> Signed-off-by: Aleksandr Bezzubikov <zuban...@gmail.com>
Add more explanation in commit log please.
> ---
> hw/i386/acpi-build.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index c99dbcc..e434efe 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -135,12 +135,6 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
> if (piix) {
> obj = piix;
> pm->cpu_hp_io_base = PIIX4_CPU_HOTPLUG_IO_BASE;
> - pcihp_io_base =
> - object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL);
> - pcihp_io_len =
> - object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, NULL);
> - pm->pcihp_io_base = (pcihp_io_base == -1) ? 0 : pcihp_io_base;
> - pm->pcihp_io_len = (pcihp_io_len == -1) ? 0 : pcihp_io_len;
> }
> if (lpc) {
> obj = lpc;
> @@ -148,6 +142,13 @@ static void acpi_get_pm_info(AcpiPmInfo *pm)
> }
> assert(obj);
>
> + pcihp_io_base =
> + object_property_get_int(obj, ACPI_PCIHP_IO_BASE_PROP, NULL);
> + pcihp_io_len =
> + object_property_get_int(obj, ACPI_PCIHP_IO_LEN_PROP, NULL);
> + pm->pcihp_io_base = (pcihp_io_base == -1) ? 0 : pcihp_io_base;
> + pm->pcihp_io_len = (pcihp_io_len == -1) ? 0 : pcihp_io_len;
> +
> /* Fill in optional s3/s4 related properties */
> o = object_property_get_qobject(obj, ACPI_PM_PROP_S3_DISABLED, NULL);
> if (o) {
> --
> 2.7.4
