diff options
| author | Vitaly Kuznetsov | 2021-04-22 18:11:25 +0200 |
|---|---|---|
| committer | Eduardo Habkost | 2021-05-31 21:53:03 +0200 |
| commit | 5aa9ef5e4bb8194e66c4b62d8fe7ef8392786a9f (patch) | |
| tree | 3dc198da30539bc2b5028019bc8e10df03a3b84c | |
| parent | i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one (diff) | |
| download | qemu-5aa9ef5e4bb8194e66c4b62d8fe7ef8392786a9f.tar.gz qemu-5aa9ef5e4bb8194e66c4b62d8fe7ef8392786a9f.tar.xz qemu-5aa9ef5e4bb8194e66c4b62d8fe7ef8392786a9f.zip | |
i386: use global kvm_state in hyperv_enabled() check
There is no need to use vCPU-specific kvm state in hyperv_enabled() check
and we need to do that when feature expansion happens early, before vCPU
specific KVM state is created.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20210422161130.652779-15-vkuznets@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
| -rw-r--r-- | target/i386/kvm/kvm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 6bcb74b1d8..c676ee8b38 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -716,8 +716,7 @@ unsigned long kvm_arch_vcpu_id(CPUState *cs) static bool hyperv_enabled(X86CPU *cpu) { - CPUState *cs = CPU(cpu); - return kvm_check_extension(cs->kvm_state, KVM_CAP_HYPERV) > 0 && + return kvm_check_extension(kvm_state, KVM_CAP_HYPERV) > 0 && ((cpu->hyperv_spinlock_attempts != HYPERV_SPINLOCK_NEVER_NOTIFY) || cpu->hyperv_features || cpu->hyperv_passthrough); } |