diff options
| author | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-02-06 16:56:15 +0100 |
|---|---|---|
| committer | Boris Ostrovsky <boris.ostrovsky@oracle.com> | 2017-02-07 14:07:01 +0100 |
| commit | 8613d78ab09900010a5b32e78ff229f551d661d6 (patch) | |
| tree | 3ac434f53d0a4856b9bcbcd2e0b2cdc8a46fa8a3 /drivers/xen | |
| parent | xen/pvh: Make sure we don't use ACPI_IRQ_MODEL_PIC for SCI (diff) | |
| download | linux-8613d78ab09900010a5b32e78ff229f551d661d6.tar.xz linux-8613d78ab09900010a5b32e78ff229f551d661d6.zip | |
xen/pvh: Initialize grant table for PVH guests
Like PV guests, PVH does not have PCI devices and therefore cannot
use MMIO space to store grants. Instead it balloons out memory and
keeps grants there.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/grant-table.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index bb36b1e1dbcc..d6786b87e13b 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1146,13 +1146,13 @@ EXPORT_SYMBOL_GPL(gnttab_init); static int __gnttab_init(void) { + if (!xen_domain()) + return -ENODEV; + /* Delay grant-table initialization in the PV on HVM case */ - if (xen_hvm_domain()) + if (xen_hvm_domain() && !xen_pvh_domain()) return 0; - if (!xen_pv_domain()) - return -ENODEV; - return gnttab_init(); } /* Starts after core_initcall so that xen_pvh_gnttab_setup can be called |