[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC v3 06/23] i386: move hyperv_version_id initialization to x86_
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH RFC v3 06/23] i386: move hyperv_version_id initialization to x86_cpu_realizefn() |
Date: |
Fri, 9 Oct 2020 14:18:25 +0200 |
As a preparation to expanding Hyper-V CPU features early, move
hyperv_version_id initialization to x86_cpu_realizefn().
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
target/i386/cpu.c | 4 ++++
target/i386/cpu.h | 1 +
target/i386/kvm.c | 14 ++++++++++++--
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 52e050a7785c..a8992b0c1c75 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6513,6 +6513,10 @@ static void x86_cpu_hyperv_realize(X86CPU *cpu)
cpu->hyperv_interface_id[1] = 0;
cpu->hyperv_interface_id[2] = 0;
cpu->hyperv_interface_id[3] = 0;
+
+ /* Hypervisor system identity */
+ cpu->hyperv_version_id[0] = 0x00001bbc;
+ cpu->hyperv_version_id[1] = 0x00060001;
}
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index d49e34a80a34..da1fdfd7a9fd 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1662,6 +1662,7 @@ struct X86CPU {
OnOffAuto hyperv_no_nonarch_cs;
uint32_t hyperv_vendor_id[3];
uint32_t hyperv_interface_id[4];
+ uint32_t hyperv_version_id[4];
bool check_cpuid;
bool enforce_cpuid;
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index eec0a7e31315..cce07f412d2f 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1224,6 +1224,14 @@ static int hyperv_handle_properties(CPUState *cs,
cpu->hyperv_interface_id[3] = c->edx;
}
+ c = cpuid_find_entry(cpuid, HV_CPUID_VERSION, 0);
+ if (c) {
+ cpu->hyperv_version_id[0] = c->eax;
+ cpu->hyperv_version_id[1] = c->ebx;
+ cpu->hyperv_version_id[2] = c->ecx;
+ cpu->hyperv_version_id[3] = c->edx;
+ }
+
c = cpuid_find_entry(cpuid, HV_CPUID_FEATURES, 0);
if (c) {
env->features[FEAT_HYPERV_EAX] = c->eax;
@@ -1313,8 +1321,10 @@ static int hyperv_handle_properties(CPUState *cs,
c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_VERSION;
- c->eax = 0x00001bbc;
- c->ebx = 0x00060001;
+ c->eax = cpu->hyperv_version_id[0];
+ c->ebx = cpu->hyperv_version_id[1];
+ c->ecx = cpu->hyperv_version_id[2];
+ c->edx = cpu->hyperv_version_id[3];
c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_FEATURES;
--
2.25.4
- [PATCH RFC v3 00/23] i386: KVM: expand Hyper-V features early, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 01/23] WIP: update linux/headers, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 02/23] i386: fill in FEAT_HYPERV_EDX from edx instead of eax, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 03/23] i386: drop x86_cpu_get_supported_feature_word() forward declaration, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 04/23] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 08/23] i386: keep hyperv_vendor string up-to-date, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 10/23] i386: always fill Hyper-V CPUID feature leaves from X86CPU data, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 09/23] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 05/23] i386: move hyperv_interface_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 06/23] i386: move hyperv_version_id initialization to x86_cpu_realizefn(),
Vitaly Kuznetsov <=
- [PATCH RFC v3 07/23] i386: move hyperv_limits initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 13/23] i386: introduce hv_cpuid_get_host(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 12/23] i386: introduce hyperv_feature_supported(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 14/23] i386: drop FEAT_HYPERV feature leaves, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 15/23] i386: introduce hv_cpuid_cache, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 11/23] i386: stop using env->features[] for filling Hyper-V CPUIDs, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 17/23] i386: move eVMCS enablement to hyperv_init_vcpu(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 18/23] i386: switch hyperv_expand_features() to using error_setg(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 16/23] i386: split hyperv_handle_properties() into hyperv_expand_features()/hyperv_fill_cpuids(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 19/23] i386: adjust the expected KVM_GET_SUPPORTED_HV_CPUID array size, Vitaly Kuznetsov, 2020/10/09