diff options
| author | Andrey Smetanin <asmetanin@virtuozzo.com> | 2015-12-28 16:27:23 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-01-08 19:04:42 +0100 |
| commit | 7be58a6488a9d36886d9423a1ed54fe104c7b182 (patch) | |
| tree | 88a170f37c39e9be625783cc157e40d90547cbd7 /arch/x86 | |
| parent | kvm/x86: Hyper-V fix SynIC timer disabling condition (diff) | |
| download | linux-7be58a6488a9d36886d9423a1ed54fe104c7b182.tar.xz linux-7be58a6488a9d36886d9423a1ed54fe104c7b182.zip | |
kvm/x86: Skip SynIC vector check for QEMU side
QEMU zero-inits Hyper-V SynIC vectors. We should allow that,
and don't reject zero values if set by the host.
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/hyperv.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index abfb9208ae53..ddae13eed075 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -72,12 +72,13 @@ static bool synic_has_vector_auto_eoi(struct kvm_vcpu_hv_synic *synic, return false; } -static int synic_set_sint(struct kvm_vcpu_hv_synic *synic, int sint, u64 data) +static int synic_set_sint(struct kvm_vcpu_hv_synic *synic, int sint, + u64 data, bool host) { int vector; vector = data & HV_SYNIC_SINT_VECTOR_MASK; - if (vector < 16) + if (vector < 16 && !host) return 1; /* * Guest may configure multiple SINTs to use the same vector, so @@ -247,7 +248,7 @@ static int synic_set_msr(struct kvm_vcpu_hv_synic *synic, break; } case HV_X64_MSR_SINT0 ... HV_X64_MSR_SINT15: - ret = synic_set_sint(synic, msr - HV_X64_MSR_SINT0, data); + ret = synic_set_sint(synic, msr - HV_X64_MSR_SINT0, data, host); break; default: ret = 1; |