[PATCH] kvm: fix typo of || to && in arch/x86/kvm/vmx.c

[Wei Yongjun]

Fix the typo of || to &&.

Signed-off-by: Wei Yongjun <yj...@cn.fujitsu.com>
---
 arch/x86/kvm/vmx.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 6259d74..3f3cab2 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1813,7 +1813,7 @@ static bool stack_segment_valid(struct kvm_vcpu *vcpu)
        vmx_get_segment(vcpu, &ss, VCPU_SREG_SS);
        ss_rpl = ss.selector & SELECTOR_RPL_MASK;
 
-       if ((ss.type != 3) || (ss.type != 7))
+       if ((ss.type != 3) && (ss.type != 7))
                return false;
        if (!ss.s)
                return false;
@@ -1856,7 +1856,7 @@ static bool tr_valid(struct kvm_vcpu *vcpu)
 
        if (tr.selector & SELECTOR_TI_MASK)     /* TI = 1 */
                return false;
-       if ((tr.type != 3) || (tr.type != 11)) /* TODO: Check if guest is in 
IA32e mode */
+       if ((tr.type != 3) && (tr.type != 11)) /* TODO: Check if guest is in 
IA32e mode */
                return false;
        if (!tr.present)
                return false;
-- 
1.5.3.8




--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html