Patchwork [for-next] x86/vmx: Drop more PVHv1 remenants

login
register
mail settings
Submitter Andrew Cooper
Date Nov. 20, 2017, 1:19 p.m.
Message ID <1511183979-30391-1-git-send-email-andrew.cooper3@citrix.com>
Download mbox | patch
Permalink /patch/386711/
State New
Headers show

Comments

Andrew Cooper - Nov. 20, 2017, 1:19 p.m.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Jun Nakajima <jun.nakajima@intel.com>
CC: Kevin Tian <kevin.tian@intel.com>
---
 xen/arch/x86/hvm/vmx/intr.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
Jan Beulich - Nov. 20, 2017, 1:25 p.m.
>>> On 20.11.17 at 14:19, <andrew.cooper3@citrix.com> wrote:
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Reviewed-by: Jan Beulich <jbeulich@suse.com>

Patch

diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c
index 4c0f1c8..eb9b288 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;