xen: suspend: refactor non-arch specific pre/post suspend hooks
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 134eb73..33312c0 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -39,6 +39,23 @@
unsigned long arg; /* extra hypercall argument */
};
+static void xen_hvm_post_suspend(void)
+{
+ gnttab_resume();
+}
+
+static void xen_pre_suspend(void)
+{
+ xen_mm_pin_all();
+ gnttab_suspend();
+}
+
+static void xen_post_suspend(void)
+{
+ gnttab_resume();
+ xen_mm_unpin_all();
+}
+
#ifdef CONFIG_PM_SLEEP
static int xen_hvm_suspend(void *data)
{
@@ -62,7 +79,7 @@
si->cancelled = HYPERVISOR_suspend(si->arg);
xen_arch_hvm_post_suspend(si->cancelled);
- gnttab_resume();
+ xen_hvm_post_suspend();
if (!si->cancelled) {
xen_irq_resume();
@@ -89,8 +106,7 @@
return err;
}
- xen_mm_pin_all();
- gnttab_suspend();
+ xen_pre_suspend();
xen_arch_pre_suspend();
/*
@@ -101,8 +117,7 @@
si->cancelled = HYPERVISOR_suspend(si->arg);
xen_arch_post_suspend(si->cancelled);
- gnttab_resume();
- xen_mm_unpin_all();
+ xen_post_suspend();
if (!si->cancelled) {
xen_irq_resume();