From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LAmuS-0007Jn-EE for qemu-devel@nongnu.org; Thu, 11 Dec 2008 09:53:00 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LAmuQ-0007Fg-Ld for qemu-devel@nongnu.org; Thu, 11 Dec 2008 09:52:59 -0500 Received: from [199.232.76.173] (port=44259 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LAmuQ-0007FT-JH for qemu-devel@nongnu.org; Thu, 11 Dec 2008 09:52:58 -0500 Received: from mx2.redhat.com ([66.187.237.31]:55677) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LAmuQ-0003vY-30 for qemu-devel@nongnu.org; Thu, 11 Dec 2008 09:52:58 -0500 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id mBBEquR8024736 for ; Thu, 11 Dec 2008 09:52:56 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id mBBEquti030535 for ; Thu, 11 Dec 2008 09:52:56 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id mBBEqj6R032402 for ; Thu, 11 Dec 2008 09:52:46 -0500 Date: Thu, 11 Dec 2008 16:53:32 +0200 From: Gleb Natapov Message-ID: <20081211145332.GL5555@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] Handle suspend in qemu. Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org BIOS changes are already upstream. Reset a PC and tell BIOS that resume from ram is required on the next boot. Signed-off-by: Gleb Natapov diff --git a/hw/acpi.c b/hw/acpi.c index 66a5faa..dd9100a 100644 --- a/hw/acpi.c +++ b/hw/acpi.c @@ -53,6 +53,8 @@ typedef struct PIIX4PMState { qemu_irq irq; } PIIX4PMState; +#define RSM_STS (1 << 15) +#define PWRBTN_STS (1 << 8) #define RTC_EN (1 << 10) #define PWRBTN_EN (1 << 8) #define GBL_EN (1 << 5) @@ -151,6 +153,14 @@ static void pm_ioport_writew(void *opaque, uint32_t addr, uint32_t val) case 0: /* soft power off */ qemu_system_shutdown_request(); break; + case 1: + /* RSM_STS should be set on resume. Pretend that resume + was caused by power button */ + s->pmsts |= (RSM_STS | PWRBTN_STS); + qemu_system_reset_request(); +#if defined(TARGET_I386) + cmos_set_s3_resume(); +#endif default: break; } @@ -471,6 +481,17 @@ static int pm_load(QEMUFile* f,void* opaque,int version_id) return 0; } +static void piix4_reset(void *opaque) +{ + PIIX4PMState *s = opaque; + uint8_t *pci_conf = s->dev.config; + + pci_conf[0x58] = 0; + pci_conf[0x59] = 0; + pci_conf[0x5a] = 0; + pci_conf[0x5b] = 0; +} + i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq) { @@ -527,6 +548,8 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, s->smbus = i2c_init_bus(); s->irq = sci_irq; + qemu_register_reset(piix4_reset, s); + return s->smbus; } diff --git a/hw/pc.c b/hw/pc.c index 20827f2..bcacf3a 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -1136,6 +1136,14 @@ static void pc_init_isa(ram_addr_t ram_size, int vga_ram_size, initrd_filename, 0, cpu_model); } +/* set CMOS shutdown status register (index 0xF) as S3_resume(0xFE) + BIOS will read it and start S3 resume at POST Entry */ +void cmos_set_s3_resume(void) +{ + if (rtc_state) + rtc_set_memory(rtc_state, 0xF, 0xFE); +} + QEMUMachine pc_machine = { .name = "pc", .desc = "Standard PC", diff --git a/hw/pc.h b/hw/pc.h index 39b220f..b0b8970 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -82,6 +82,7 @@ RTCState *rtc_init(int base, qemu_irq irq); RTCState *rtc_mm_init(target_phys_addr_t base, int it_shift, qemu_irq irq); 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; -- Gleb.