summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@citrix.com>2019-04-23 15:04:15 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-22 07:37:45 +0200
commit756eda9bc8b7bcd58b0f6a1333dc46fc9c22397a (patch)
tree0edbf273ee4977b85e4a6487e547f9e8c3c78326 /arch/x86
parent98bdd33883db43b1612ca0dfc3563313497935c5 (diff)
xen/pvh: set xen_domain_type to HVM in xen_pvh_init
commit c9f804d64bb93c8dbf957df1d7e9de11380e522d upstream. 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+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/enlighten_pvh.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c
index f7f77023288a..dab07827d25e 100644
--- a/arch/x86/xen/enlighten_pvh.c
+++ b/arch/x86/xen/enlighten_pvh.c
@@ -97,6 +97,7 @@ void __init xen_prepare_pvh(void)
}
xen_pvh = 1;
+ xen_domain_type = XEN_HVM_DOMAIN;
xen_start_flags = pvh_start_info.flags;
msr = cpuid_ebx(xen_cpuid_base() + 2);