From da98c8eb4c35225049cad8cf767647eb39788b5d Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 23 Feb 2012 13:45:20 +0100 Subject: suspend: switch acpi s3 to new infrastructure. This patch switches pc s3 suspend over to the new infrastructure. The cmos_s3 qemu_irq is killed, the new notifier is used instead. The xen hack goes away with that too, the hypercall can simply be done in a notifier function now. This patch also makes the guest actually stay suspended instead of leaving suspend instantly, so it is useful for more than just testing whenever the suspend/resume cycle actually works. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/acpi.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/acpi.h') diff --git a/hw/acpi.h b/hw/acpi.h index 88f805119c..fe8cdb48e0 100644 --- a/hw/acpi.h +++ b/hw/acpi.h @@ -96,7 +96,6 @@ struct ACPIPM1EVT { struct ACPIPM1CNT { uint16_t cnt; - qemu_irq cmos_s3; }; struct ACPIGPE { @@ -114,6 +113,7 @@ struct ACPIREGS { ACPIPM1EVT evt; ACPIPM1CNT cnt; } pm1; + Notifier wakeup; }; /* PM_TMR */ @@ -138,7 +138,7 @@ void acpi_pm1_evt_power_down(ACPIREGS *ar); void acpi_pm1_evt_reset(ACPIREGS *ar); /* PM1a_CNT: piix and ich9 don't implement PM1b CNT. */ -void acpi_pm1_cnt_init(ACPIREGS *ar, qemu_irq cmos_s3); +void acpi_pm1_cnt_init(ACPIREGS *ar); void acpi_pm1_cnt_write(ACPIREGS *ar, uint16_t val); void acpi_pm1_cnt_update(ACPIREGS *ar, bool sci_enable, bool sci_disable); -- cgit v1.2.3