From: Tim Deegan Date: Wed, 11 Apr 2012 12:10:33 +0000 (+0100) Subject: x86: fix logical ANDs used to mask bitfields. X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5a90fc8ea3ddc2ed2b6fcbbaf991e6e353eba9de;p=xen.git x86: fix logical ANDs used to mask bitfields. Signed-off-by: Tim Deegan Acked-by: Jan Beulich Acked-by: Keir Fraser Committed-by: Tim Deegan --- diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e7624f581f..4c34813ae4 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -752,7 +752,7 @@ static void svm_lwp_interrupt(struct cpu_user_regs *regs) ack_APIC_irq(); vlapic_set_irq( vcpu_vlapic(curr), - (curr->arch.hvm_svm.guest_lwp_cfg >> 40) && 0xff, + (curr->arch.hvm_svm.guest_lwp_cfg >> 40) & 0xff, 0); } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 8cd24c0ba1..ab01fd008d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1382,7 +1382,7 @@ void vmx_inject_extint(int trap) if ( nestedhvm_vcpu_in_guestmode(v) ) { pin_based_cntrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); - if ( pin_based_cntrl && PIN_BASED_EXT_INTR_MASK ) { + if ( pin_based_cntrl & PIN_BASED_EXT_INTR_MASK ) { nvmx_enqueue_n2_exceptions (v, INTR_INFO_VALID_MASK | (X86_EVENTTYPE_EXT_INTR<<8) | trap, HVM_DELIVER_NO_ERROR_CODE); @@ -1401,7 +1401,7 @@ void vmx_inject_nmi(void) if ( nestedhvm_vcpu_in_guestmode(v) ) { pin_based_cntrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); - if ( pin_based_cntrl && PIN_BASED_NMI_EXITING ) { + if ( pin_based_cntrl & PIN_BASED_NMI_EXITING ) { nvmx_enqueue_n2_exceptions (v, INTR_INFO_VALID_MASK | (X86_EVENTTYPE_NMI<<8) | TRAP_nmi, HVM_DELIVER_NO_ERROR_CODE);