From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 20 Nov 2017 13:18:45 +0000 (+0000)
Subject: x86/vmx: Drop more PVHv1 remenants
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~976
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e225eb8d9956e74207b8c333430ab9f4b5379d47;p=xen.git

x86/vmx: Drop more PVHv1 remenants

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
---

diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c
index 4c0f1c8f71..eb9b288e8c 100644
--- a/xen/arch/x86/hvm/vmx/intr.c
+++ b/xen/arch/x86/hvm/vmx/intr.c
@@ -229,7 +229,7 @@ void vmx_intr_assist(void)
     struct vcpu *v = current;
     unsigned int tpr_threshold = 0;
     enum hvm_intblk intblk;
-    int pt_vector = -1;
+    int pt_vector;
 
     /* Block event injection when single step with MTF. */
     if ( unlikely(v->arch.hvm_vcpu.single_step) )
@@ -240,8 +240,7 @@ void vmx_intr_assist(void)
     }
 
     /* Crank the handle on interrupt state. */
-    if ( is_hvm_vcpu(v) )
-        pt_vector = pt_update_irq(v);
+    pt_vector = pt_update_irq(v);
 
     do {
         unsigned long intr_info;