diff options
| author | Vitaly Kuznetsov <vkuznets@redhat.com> | 2020-11-19 11:32:19 +0100 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2020-12-16 14:07:33 -0500 |
| commit | fb7e31aa4ff2ffeae7519ec3abed33e0e98976b7 (patch) | |
| tree | f67af7c9c31b7f5e8da18b31f5f4677897ad82eb /target | |
| parent | 735db465b00930c629e8d12898e909a1100efb5e (diff) | |
i386: move hyperv_version_id initialization to x86_cpu_realizefn()
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>
Message-Id: <20201119103221.1665171-4-vkuznets@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/i386/cpu.c | 4 | ||||
| -rw-r--r-- | target/i386/cpu.h | 1 | ||||
| -rw-r--r-- | target/i386/kvm/kvm.c | 14 |
3 files changed, 17 insertions, 2 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ab10c0225d..6c5b0fef79 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6567,6 +6567,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 fd29afebc9..adce57dc78 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1666,6 +1666,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/kvm.c b/target/i386/kvm/kvm.c index d3aa7ca281..db2069406d 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -1222,6 +1222,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; @@ -1311,8 +1319,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; |