From 53b67b3052f39b049bc7c79ae1ce132c90098c6c Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Mon, 29 Mar 2010 19:23:52 +0000 Subject: Compile acpi only once Use qemu_irqs to trigger CMOS S3 and SMI events. Avoid using kvm.h, which uses CPUState. Signed-off-by: Blue Swirl --- hw/pc.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'hw/pc.h') diff --git a/hw/pc.h b/hw/pc.h index 7f1b8ee120..5f86b37fb2 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -73,7 +73,6 @@ typedef struct RTCState RTCState; RTCState *rtc_init(int base_year); void rtc_set_memory(RTCState *s, int addr, int val); void rtc_set_date(RTCState *s, const struct tm *tm); -void cmos_set_s3_resume(void); /* pc.c */ extern int fd_bootchk; @@ -90,8 +89,10 @@ void acpi_bios_init(void); int acpi_table_add(const char *table_desc); /* acpi_piix.c */ + i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, - qemu_irq sci_irq); + qemu_irq sci_irq, qemu_irq cmos_s3, qemu_irq smi_irq, + int kvm_enabled); void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr); void piix4_acpi_system_hot_add_init(PCIBus *bus); -- cgit v1.2.1