From: Roger Pau Monne <roger.pau@citrix.com>
Date: Tue, 23 Apr 2019 13:04:15 +0000 (+0200)
Subject: xen/pvh: set xen_domain_type to HVM in xen_pvh_init
X-Git-Tag: v5.2-rc1~51^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c9f804d64bb93c8dbf957df1d7e9de11380e522d;p=uclinux-h8%2Flinux.git

xen/pvh: set xen_domain_type to HVM in xen_pvh_init

Or else xen_domain() returns false despite xen_pvh being set.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: stable@vger.kernel.org # 4.19+
---

diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c
index 35b7599d2d0b..bbffa409e0e8 100644
--- a/arch/x86/xen/enlighten_pvh.c
+++ b/arch/x86/xen/enlighten_pvh.c
@@ -27,6 +27,7 @@ void __init xen_pvh_init(void)
 	u64 pfn;
 
 	xen_pvh = 1;
+	xen_domain_type = XEN_HVM_DOMAIN;
 	xen_start_flags = pvh_start_info.flags;
 
 	msr = cpuid_ebx(xen_cpuid_base() + 2);