diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-02-23 13:45:20 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-24 13:36:03 -0600 |
| commit | da98c8eb4c35225049cad8cf767647eb39788b5d (patch) | |
| tree | b6321ed36190de3ecf265ae4c5b25a2bfe54bb3e /hw/acpi_piix4.c | |
| parent | 95b363b5c643d8ad81c5377726e753b84c909037 (diff) | |
| download | qemu-da98c8eb4c35225049cad8cf767647eb39788b5d.zip qemu-da98c8eb4c35225049cad8cf767647eb39788b5d.tar.gz qemu-da98c8eb4c35225049cad8cf767647eb39788b5d.tar.bz2 | |
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 <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/acpi_piix4.c')
| -rw-r--r-- | hw/acpi_piix4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c index 1641229..797ed24 100644 --- a/hw/acpi_piix4.c +++ b/hw/acpi_piix4.c @@ -372,7 +372,7 @@ static int piix4_pm_initfn(PCIDevice *dev) } i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq sci_irq, qemu_irq cmos_s3, qemu_irq smi_irq, + qemu_irq sci_irq, qemu_irq smi_irq, int kvm_enabled) { PCIDevice *dev; @@ -383,7 +383,7 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, s = DO_UPCAST(PIIX4PMState, dev, dev); s->irq = sci_irq; - acpi_pm1_cnt_init(&s->ar, cmos_s3); + acpi_pm1_cnt_init(&s->ar); s->smi_irq = smi_irq; s->kvm_enabled = kvm_enabled; |