From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Date: Wed, 11 Oct 2017 12:49:55 +0000 (+0200)
Subject: x86/vmx: remove unnecessary is_hvm_domain() test in construct_vmcs()
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1134
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6dd2845c64d9d15c6691a0656505445c2e736fac;p=xen.git

x86/vmx: remove unnecessary is_hvm_domain() test in construct_vmcs()

It's a leftover from PVHv1 days.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index f62fe7e217..b5100b5021 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -1271,14 +1271,10 @@ static int construct_vmcs(struct vcpu *v)
 
     vmx_vmcs_exit(v);
 
-    /* PVH: paging mode is updated by arch_set_info_guest(). */
-    if ( is_hvm_domain(d) )
-    {
-        /* will update HOST & GUEST_CR3 as reqd */
-        paging_update_paging_modes(v);
+    /* will update HOST & GUEST_CR3 as reqd */
+    paging_update_paging_modes(v);
 
-        vmx_vlapic_msr_changed(v);
-    }
+    vmx_vlapic_msr_changed(v);
 
     return 0;
 }