Commit 560e6396 authored by Bruce Rogers's avatar Bruce Rogers Committed by Anthony Liguori
Browse files

acpi: initialize s4_val used in s4 shutdown 



While investigating why a 32 bit Windows 2003 guest wasn't able to
successfully perform a shutdown /h, it was discovered that commit
afafe4bb inadvertently dropped the
initialization of the s4_val used to handle s4 shutdown.
Initialize the value as before.

Signed-off-by: default avatarBruce Rogers <brogers@suse.com>
Message-id: 1364928100-487-1-git-send-email-brogers@suse.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent a509d632

hw/acpi.c

+2 −1
Original line number Diff line number Diff line
@@ -472,8 +472,9 @@ static const MemoryRegionOps acpi_pm_cnt_ops = { 
    .endianness = DEVICE_LITTLE_ENDIAN,

};



void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent)

void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, uint8_t s4_val)

{

    ar->pm1.cnt.s4_val = s4_val;

    ar->wakeup.notify = acpi_notify_wakeup;

    qemu_register_wakeup_notifier(&ar->wakeup);

    memory_region_init_io(&ar->pm1.cnt.io, &acpi_pm_cnt_ops, ar, "acpi-cnt", 2);

hw/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ void acpi_pm1_evt_init(ACPIREGS *ar, acpi_update_sci_fn update_sci, 
                       MemoryRegion *parent);



/* PM1a_CNT: piix and ich9 don't implement PM1b CNT. */

void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent);

void acpi_pm1_cnt_init(ACPIREGS *ar, MemoryRegion *parent, uint8_t s4_val);

void acpi_pm1_cnt_update(ACPIREGS *ar,

                         bool sci_enable, bool sci_disable);

void acpi_pm1_cnt_reset(ACPIREGS *ar);

hw/acpi_ich9.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, 


    acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);

    acpi_pm1_evt_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io);

    acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io);

    acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io, 2);



    acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN);

    memory_region_init_io(&pm->io_gpe, &ich9_gpe_ops, pm, "apci-gpe0",

hw/acpi_piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static int piix4_pm_initfn(PCIDevice *dev) 


    acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io);

    acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io);

    acpi_pm1_cnt_init(&s->ar, &s->io);

    acpi_pm1_cnt_init(&s->ar, &s->io, s->s4_val);

    acpi_gpe_init(&s->ar, GPE_LEN);



    s->powerdown_notifier.notify = piix4_pm_powerdown_req;

hw/vt82c686.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static int vt82c686b_pm_initfn(PCIDevice *dev) 


    acpi_pm_tmr_init(&s->ar, pm_tmr_timer, &s->io);

    acpi_pm1_evt_init(&s->ar, pm_tmr_timer, &s->io);

    acpi_pm1_cnt_init(&s->ar, &s->io);

    acpi_pm1_cnt_init(&s->ar, &s->io, 2);



    return 0;

}