Commit 23a3b201 authored Dec 28, 2015 by Andrey Smetanin Committed by Paolo Bonzini Jan 08, 2016

kvm/x86: Hyper-V fix SynIC timer disabling condition



Hypervisor Function Specification(HFS) doesn't require
to disable SynIC timer at timer config write if timer->count = 0.

So drop this check, this allow to load timers MSR's
during migration restore, because config are set before count
in QEMU side.

Also fix condition according to HFS doc(15.3.1):
"It is not permitted to set the SINTx field to zero for an
enabled timer. If attempted, the timer will be
marked disabled (that is, bit 0 cleared) immediately."

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>

parent 0cdeabb1

arch/x86/kvm/hyperv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -474,7 +474,7 @@ static int stimer_start(struct kvm_vcpu_hv_stimer *stimer)
		static int stimer_set_config(struct kvm_vcpu_hv_stimer *stimer, u64 config,
		bool host)
		{
		if (stimer->count == 0 \|\| HV_STIMER_SINT(config) == 0)
		if ((stimer->config & HV_STIMER_ENABLE) && HV_STIMER_SINT(config) == 0)
		config &= ~HV_STIMER_ENABLE;
		stimer->config = config;
		stimer_cleanup(stimer);

Admin message