From: Andrey Smetanin <asmetanin@virtuozzo.com>
Date: Mon, 28 Dec 2015 15:27:18 +0000 (+0300)
Subject: kvm/x86: Hyper-V timers fix incorrect logical operation
X-Git-Tag: android-x86-7.1-r1~2172^2~12
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ac1b65ac199205724a8077d37ba7e64a1b7e77c;p=android-x86%2Fkernel.git

kvm/x86: Hyper-V timers fix incorrect logical operation

Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com>
Reviewed-by: Roman Kagan <rkagan@virtuozzo.com>
CC: Gleb Natapov <gleb@kernel.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Roman Kagan <rkagan@virtuozzo.com>
CC: Denis V. Lunev <den@openvz.org>
CC: qemu-devel@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index f34f666778b2..e4ef13a37d4c 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -583,7 +583,7 @@ static void stimer_expiration(struct kvm_vcpu_hv_stimer *stimer)
 {
 	stimer_send_msg(stimer);
 	if (!(stimer->config & HV_STIMER_PERIODIC))
-		stimer->config |= ~HV_STIMER_ENABLE;
+		stimer->config &= ~HV_STIMER_ENABLE;
 	else
 		stimer_restart(stimer);
 }