xen: suspend: pass extra hypercall argument via suspend_info struct
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 5c0184f..6ce6b91 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -36,6 +36,7 @@
struct suspend_info {
int cancelled;
+ unsigned long arg; /* extra hypercall argument */
};
#ifdef CONFIG_PM_SLEEP
@@ -58,7 +59,7 @@
* or the domain was merely checkpointed, and 0 if it
* is resuming in a new domain.
*/
- si->cancelled = HYPERVISOR_suspend(0UL);
+ si->cancelled = HYPERVISOR_suspend(si->arg);
xen_hvm_post_suspend(si->cancelled);
gnttab_resume();
@@ -97,7 +98,7 @@
* or the domain was merely checkpointed, and 0 if it
* is resuming in a new domain.
*/
- si->cancelled = HYPERVISOR_suspend(virt_to_mfn(xen_start_info));
+ si->cancelled = HYPERVISOR_suspend(si->arg);
xen_post_suspend(si->cancelled);
gnttab_resume();
@@ -150,6 +151,11 @@
si.cancelled = 1;
if (xen_hvm_domain())
+ si.arg = 0UL;
+ else
+ si.arg = virt_to_mfn(xen_start_info);
+
+ if (xen_hvm_domain())
err = stop_machine(xen_hvm_suspend, &si, cpumask_of(0));
else
err = stop_machine(xen_suspend, &si, cpumask_of(0));