From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753594AbdAZUoh (ORCPT ); Thu, 26 Jan 2017 15:44:37 -0500 Received: from userp1050.oracle.com ([156.151.31.82]:19731 "EHLO userp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752373AbdAZUof (ORCPT ); Thu, 26 Jan 2017 15:44:35 -0500 From: Boris Ostrovsky To: JGross@suse.com Cc: roger.pau@citrix.com, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, boris.ostrovsky@oracle.com Subject: [PATCH v2 6/9] xen/pvh: Initialize grant table for PVH guests Date: Thu, 26 Jan 2017 14:41:29 -0500 Message-Id: <1485459692-23961-7-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1485459692-23961-1-git-send-email-boris.ostrovsky@oracle.com> References: <1485459692-23961-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userp1040.oracle.com [156.151.31.81] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Changes in v2: * Updated commit message drivers/xen/grant-table.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index bb36b1e..d6786b8 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -1146,13 +1146,13 @@ int gnttab_init(void) 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 -- 1.8.3.1