From 1cbe2f5370ddbeae450978b39799240a9c899bcd Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Tue, 4 May 2010 12:24:12 +0300 Subject: [PATCH] --- yaml --- r: 202231 b: refs/heads/master c: c332c83ae736c72dcf072e96e98a774fce39e722 h: refs/heads/master i: 202229: 0746cd7bfe7aa0c6d948b8c34bdaac54421fb192 202227: f1d714c72017c4e02259ddd9128367ab9fdc068c 202223: 156d7af13a645ac98f1daea86646486f5492b215 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4b104c378795..e25da8e41b1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf998156d24bcb127318ad5bf531ac3bdfcd6449 +refs/heads/master: c332c83ae736c72dcf072e96e98a774fce39e722 diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index ee03679efe78..64252075796a 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -2826,9 +2826,7 @@ static bool vmx_get_nmi_mask(struct kvm_vcpu *vcpu) { if (!cpu_has_virtual_nmis()) return to_vmx(vcpu)->soft_vnmi_blocked; - else - return !!(vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & - GUEST_INTR_STATE_NMI); + return vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & GUEST_INTR_STATE_NMI; } static void vmx_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked)