ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i386: move hyperv_interface_id initialization to x86_cpu_realizefn() 

As a preparation to expanding Hyper-V CPU features early, move
hyperv_interface_id initialization to x86_cpu_realizefn().

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20201119103221.1665171-3-vkuznets@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Vitaly Kuznetsov 2020-11-19 11:32:18 +01:00 committed by Eduardo Habkost
parent 088567713f
commit 735db465b0
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/i386/cpu.c
View File

@ -6561,6 +6561,12 @@ static void x86_cpu_hyperv_realize(X86CPU *cpu)
memset(cpu->hyperv_vendor_id, 0, 12); memset(cpu->hyperv_vendor_id, 0, 12);
memcpy(cpu->hyperv_vendor_id, cpu->hyperv_vendor, len); memcpy(cpu->hyperv_vendor_id, cpu->hyperv_vendor, len);
} }
/* 'Hv#1' interface identification*/
cpu->hyperv_interface_id[0] = 0x31237648;
cpu->hyperv_interface_id[1] = 0;
cpu->hyperv_interface_id[2] = 0;
cpu->hyperv_interface_id[3] = 0;
} }
static void x86_cpu_realizefn(DeviceState *dev, Error **errp) static void x86_cpu_realizefn(DeviceState *dev, Error **errp)

1
target/i386/cpu.h
View File

@ -1665,6 +1665,7 @@ struct X86CPU {
bool hyperv_passthrough; bool hyperv_passthrough;
OnOffAuto hyperv_no_nonarch_cs; OnOffAuto hyperv_no_nonarch_cs;
uint32_t hyperv_vendor_id[3]; uint32_t hyperv_vendor_id[3];
uint32_t hyperv_interface_id[4];
bool check_cpuid; bool check_cpuid;
bool enforce_cpuid; bool enforce_cpuid;

18
target/i386/kvm/kvm.c
View File

@ -1171,7 +1171,6 @@ static int hyperv_handle_properties(CPUState *cs,
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
struct kvm_cpuid2 *cpuid; struct kvm_cpuid2 *cpuid;
struct kvm_cpuid_entry2 *c; struct kvm_cpuid_entry2 *c;
uint32_t signature[3];
uint32_t cpuid_i = 0; uint32_t cpuid_i = 0;
int r; int r;
@ -1215,6 +1214,14 @@ static int hyperv_handle_properties(CPUState *cs,
cpu->hyperv_vendor_id[2] = c->edx; cpu->hyperv_vendor_id[2] = c->edx;
} }
c = cpuid_find_entry(cpuid, HV_CPUID_INTERFACE, 0);
if (c) {
cpu->hyperv_interface_id[0] = c->eax;
cpu->hyperv_interface_id[1] = c->ebx;
cpu->hyperv_interface_id[2] = c->ecx;
cpu->hyperv_interface_id[3] = c->edx;
}
c = cpuid_find_entry(cpuid, HV_CPUID_FEATURES, 0); c = cpuid_find_entry(cpuid, HV_CPUID_FEATURES, 0);
if (c) { if (c) {
env->features[FEAT_HYPERV_EAX] = c->eax; env->features[FEAT_HYPERV_EAX] = c->eax;
@ -1297,11 +1304,10 @@ static int hyperv_handle_properties(CPUState *cs,
c = &cpuid_ent[cpuid_i++]; c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_INTERFACE; c->function = HV_CPUID_INTERFACE;
memcpy(signature, "Hv#1\0\0\0\0\0\0\0\0", 12); c->eax = cpu->hyperv_interface_id[0];
c->eax = signature[0]; c->ebx = cpu->hyperv_interface_id[1];
c->ebx = 0; c->ecx = cpu->hyperv_interface_id[2];
c->ecx = 0; c->edx = cpu->hyperv_interface_id[3];
c->edx = 0;
c = &cpuid_ent[cpuid_i++]; c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_VERSION; c->function = HV_CPUID_VERSION;