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/mips_malta.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/mips_malta.c')
| -rw-r--r-- | hw/mips_malta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 86a5fbb..b1563ed 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -967,7 +967,7 @@ void mips_malta_init (ram_addr_t ram_size, pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); usb_uhci_piix4_init(pci_bus, piix4_devfn + 2); smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, - isa_get_irq(NULL, 9), NULL, NULL, 0); + isa_get_irq(NULL, 9), NULL, 0); /* TODO: Populate SPD eeprom data. */ smbus_eeprom_init(smbus, 8, NULL, 0); pit = pit_init(isa_bus, 0x40, 0, NULL); |