2983660f65
CVE-2013-4377: Fix crash when unplugging virtio devices (bz #1012633, bz #1012641) Fix 'new snapshot' slowness after the first snap (bz #988436) Fix 9pfs xattrs on kernel 3.11 (bz #1013676) CVE-2013-4344: buffer overflow in scsi_target_emulate_report_luns (bz #1015274, bz #1007330)
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 1b5f7709411a412ec8ce21004a47f51ab6c3f3ad Mon Sep 17 00:00:00 2001
|
|
From: "Liu, Jinsong" <jinsong.liu@intel.com>
|
|
Date: Wed, 25 Sep 2013 16:40:23 +0000
|
|
Subject: [PATCH] qemu: Add qemu xen logic for Xen HVM S3 resume
|
|
|
|
This patch is qemu patch 2 to fix Xen HVM S3 bug, adding qemu
|
|
xen logic. When qemu wakeup, qemu xen logic is notified and
|
|
hypercall to xen hypervisor to unpause domain.
|
|
|
|
Signed-off-by: Liu Jinsong <jinsong.liu@intel.com>
|
|
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
|
|
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
(cherry picked from commit 11addd0ab9371af2b6ec028c7fe4e4c4992252fc)
|
|
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
xen-all.c | 9 +++++++++
|
|
1 file changed, 9 insertions(+)
|
|
|
|
diff --git a/xen-all.c b/xen-all.c
|
|
index e1d0694..7894ac6 100644
|
|
--- a/xen-all.c
|
|
+++ b/xen-all.c
|
|
@@ -98,6 +98,7 @@ typedef struct XenIOState {
|
|
|
|
Notifier exit;
|
|
Notifier suspend;
|
|
+ Notifier wakeup;
|
|
} XenIOState;
|
|
|
|
/* Xen specific function for piix pci */
|
|
@@ -1060,6 +1061,11 @@ static void xen_read_physmap(XenIOState *state)
|
|
free(entries);
|
|
}
|
|
|
|
+static void xen_wakeup_notifier(Notifier *notifier, void *data)
|
|
+{
|
|
+ xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);
|
|
+}
|
|
+
|
|
int xen_hvm_init(MemoryRegion **ram_memory)
|
|
{
|
|
int i, rc;
|
|
@@ -1089,6 +1095,9 @@ int xen_hvm_init(MemoryRegion **ram_memory)
|
|
state->suspend.notify = xen_suspend_notifier;
|
|
qemu_register_suspend_notifier(&state->suspend);
|
|
|
|
+ state->wakeup.notify = xen_wakeup_notifier;
|
|
+ qemu_register_wakeup_notifier(&state->wakeup);
|
|
+
|
|
xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn);
|
|
DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
|
|
state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
|