diff options
| author |   David Vrabel <david.vrabel@citrix.com> | 2014-06-16 11:12:03 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-06-18 10:58:01 +0100 |
| commit | 13cd36a37a06ae0318d23b7e60adf0dac3547238 (patch) | |
| tree | 9562b159bf963cd10c46e8ad5248e32b488fd031 /drivers/xen | |
| parent | x86/xen: no need to explicitly register an NMI callback (diff) | |
| download | linux-dev-13cd36a37a06ae0318d23b7e60adf0dac3547238.tar.xz linux-dev-13cd36a37a06ae0318d23b7e60adf0dac3547238.zip | |
xen/grant-table: fix suspend for non-PV guests
Commit aa8532c32216ae07c3813b9aeb774517878a7573 (xen: refactor suspend
pre/post hooks) broke resuming PVHVM (auto-translated physmap) guests.
The gnttab_suspend() would clear the mapping for the grant table
frames, but the ->unmap_frames() call is only applicable to PV guests.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Reported-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/grant-table.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 6d325bda76da..5d4de88fe5b8 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1168,7 +1168,8 @@ int gnttab_resume(void) int gnttab_suspend(void) { - gnttab_interface->unmap_frames(); + if (!xen_feature(XENFEAT_auto_translated_physmap)) + gnttab_interface->unmap_frames(); return 0; } |