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/pc_piix.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/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index fe7a729..5e11d15 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -139,7 +139,6 @@ static void pc_init1(MemoryRegion *system_memory, qemu_irq *cpu_irq; qemu_irq *gsi; qemu_irq *i8259; - qemu_irq *cmos_s3; qemu_irq *smi_irq; GSIState *gsi_state; DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; @@ -291,15 +290,10 @@ static void pc_init1(MemoryRegion *system_memory, if (pci_enabled && acpi_enabled) { i2c_bus *smbus; - if (!xen_enabled()) { - cmos_s3 = qemu_allocate_irqs(pc_cmos_set_s3_resume, rtc_state, 1); - } else { - cmos_s3 = qemu_allocate_irqs(xen_cmos_set_s3_resume, rtc_state, 1); - } smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1); /* TODO: Populate SPD eeprom data. */ smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100, - gsi[9], *cmos_s3, *smi_irq, + gsi[9], *smi_irq, kvm_enabled()); smbus_eeprom_init(smbus, 8, NULL, 0); } |