Signed-off-by: Gleb Natapov <[email protected]>
---
qemu/hw/acpi.c | 2 +-
qemu/qemu-kvm.c | 2 +-
qemu/qemu-kvm.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/qemu/hw/acpi.c b/qemu/hw/acpi.c
index 0ff8851..219d8ac 100644
--- a/qemu/hw/acpi.c
+++ b/qemu/hw/acpi.c
@@ -159,7 +159,7 @@ static void pm_ioport_writew(void *opaque, uint32_t addr,
uint32_t val)
/* 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();
+ kvm_shutdown(NULL, cpu_single_env);
#if defined(TARGET_I386)
cmos_set_s3_resume();
#endif
diff --git a/qemu/qemu-kvm.c b/qemu/qemu-kvm.c
index 01c265b..179f1c2 100644
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -722,7 +722,7 @@ static int kvm_halt(void *opaque, int vcpu)
return kvm_arch_halt(opaque, vcpu);
}
-static int kvm_shutdown(void *opaque, void *data)
+int kvm_shutdown(void *opaque, void *data)
{
struct CPUState *env = (struct CPUState *)data;
diff --git a/qemu/qemu-kvm.h b/qemu/qemu-kvm.h
index ec27d06..249f46a 100644
--- a/qemu/qemu-kvm.h
+++ b/qemu/qemu-kvm.h
@@ -100,6 +100,7 @@ int kvm_arch_remove_hw_breakpoint(target_ulong addr,
target_ulong len, int type);
void kvm_arch_remove_all_hw_breakpoints(void);
void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg);
+int kvm_shutdown(void *opaque, void *data);
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
