mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
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>
This commit is contained in:
parent
735db465b0
commit
fb7e31aa4f
3 changed files with 17 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue