summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@citrix.com>2019-04-23 16:04:15 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-22 08:39:57 +0300
commit97f060474d2d66f795c89f9d5c17c5a82810a6b2 (patch)
treedbc1b43fc485095039110de6f01181195aae707a /arch
parentfdea76e57353b77bb8948225e1d207198b535dfd (diff)
downloadlinux-97f060474d2d66f795c89f9d5c17c5a82810a6b2.tar.xz
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')
-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 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);