[PATCH 2/8] Handle suspend in qemu.

[Gleb Natapov]

Signed-off-by: Gleb Natapov <[EMAIL PROTECTED]>
---

 qemu/hw/acpi.c  |   10 ++++++++++
 qemu/hw/pc.c    |    8 ++++++++
 qemu/hw/pc.h    |    1 +
 qemu/qemu-kvm.c |    2 +-
 qemu/qemu-kvm.h |    1 +
 5 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/qemu/hw/acpi.c b/qemu/hw/acpi.c
index 7a7a534..e6494c5 100644
--- a/qemu/hw/acpi.c
+++ b/qemu/hw/acpi.c
@@ -56,6 +56,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)
@@ -154,6 +156,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);
+                   kvm_shutdown(NULL, 0);
+#if defined(TARGET_I386)
+                   cmos_set_s3_resume();
+#endif
                 default:
                     break;
                 }
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index d559f0c..37d013e 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -1183,6 +1183,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/qemu/hw/pc.h b/qemu/hw/pc.h
index 1f63678..af9071a 100644
--- a/qemu/hw/pc.h
+++ b/qemu/hw/pc.h
@@ -85,6 +85,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;
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index c5f3f29..80cdb40 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -721,7 +721,7 @@ static int kvm_halt(void *opaque, int vcpu)
     return kvm_arch_halt(opaque, vcpu);
 }
 
-static int kvm_shutdown(void *opaque, int vcpu)
+int kvm_shutdown(void *opaque, int vcpu)
 {
     /* stop the current vcpu from going back to guest mode */
     vcpu_info[cpu_single_env->cpu_index].stopped = 1;
diff --git a/qemu/qemu-kvm.h b/qemu/qemu-kvm.h
index a1d6646..f5b530c 100644
--- a/qemu/qemu-kvm.h
+++ b/qemu/qemu-kvm.h
@@ -72,6 +72,7 @@ void kvm_arch_update_regs_for_sipi(CPUState *env);
 void kvm_arch_cpu_reset(CPUState *env);
 
 CPUState *qemu_kvm_cpu_env(int index);
+int kvm_shutdown(void *opaque, int vcpu);
 
 void qemu_kvm_aio_wait_start(void);
 void qemu_kvm_aio_wait(void);

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html