mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
i386: move hyperv_vendor_id initialization to x86_cpu_realizefn()
As a preparation to expanding Hyper-V CPU features early, move hyperv_vendor_id initialization to x86_cpu_realizefn(). Introduce x86_cpu_hyperv_realize() to not not pollute x86_cpu_realizefn() itself. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Message-Id: <20201119103221.1665171-2-vkuznets@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
0c36af8ce8
commit
088567713f
3 changed files with 34 additions and 17 deletions
|
@ -6544,6 +6544,25 @@ static void x86_cpu_filter_features(X86CPU *cpu, bool verbose)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void x86_cpu_hyperv_realize(X86CPU *cpu)
|
||||||
|
{
|
||||||
|
size_t len;
|
||||||
|
|
||||||
|
/* Hyper-V vendor id */
|
||||||
|
if (!cpu->hyperv_vendor) {
|
||||||
|
memcpy(cpu->hyperv_vendor_id, "Microsoft Hv", 12);
|
||||||
|
} else {
|
||||||
|
len = strlen(cpu->hyperv_vendor);
|
||||||
|
|
||||||
|
if (len > 12) {
|
||||||
|
warn_report("hv-vendor-id truncated to 12 characters");
|
||||||
|
len = 12;
|
||||||
|
}
|
||||||
|
memset(cpu->hyperv_vendor_id, 0, 12);
|
||||||
|
memcpy(cpu->hyperv_vendor_id, cpu->hyperv_vendor, len);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
{
|
{
|
||||||
CPUState *cs = CPU(dev);
|
CPUState *cs = CPU(dev);
|
||||||
|
@ -6715,6 +6734,8 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
env->cache_info_amd.l3_cache = &legacy_l3_cache;
|
env->cache_info_amd.l3_cache = &legacy_l3_cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Process Hyper-V enlightenments */
|
||||||
|
x86_cpu_hyperv_realize(cpu);
|
||||||
|
|
||||||
cpu_exec_realizefn(cs, &local_err);
|
cpu_exec_realizefn(cs, &local_err);
|
||||||
if (local_err != NULL) {
|
if (local_err != NULL) {
|
||||||
|
@ -7218,7 +7239,7 @@ static Property x86_cpu_properties[] = {
|
||||||
DEFINE_PROP_UINT32("min-xlevel2", X86CPU, env.cpuid_min_xlevel2, 0),
|
DEFINE_PROP_UINT32("min-xlevel2", X86CPU, env.cpuid_min_xlevel2, 0),
|
||||||
DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0),
|
DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0),
|
||||||
DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_level, true),
|
DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_level, true),
|
||||||
DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id),
|
DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor),
|
||||||
DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true),
|
DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true),
|
||||||
DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false),
|
DEFINE_PROP_BOOL("lmce", X86CPU, enable_lmce, false),
|
||||||
DEFINE_PROP_BOOL("l3-cache", X86CPU, enable_l3_cache, true),
|
DEFINE_PROP_BOOL("l3-cache", X86CPU, enable_l3_cache, true),
|
||||||
|
|
|
@ -1659,11 +1659,12 @@ struct X86CPU {
|
||||||
uint64_t ucode_rev;
|
uint64_t ucode_rev;
|
||||||
|
|
||||||
uint32_t hyperv_spinlock_attempts;
|
uint32_t hyperv_spinlock_attempts;
|
||||||
char *hyperv_vendor_id;
|
char *hyperv_vendor;
|
||||||
bool hyperv_synic_kvm_only;
|
bool hyperv_synic_kvm_only;
|
||||||
uint64_t hyperv_features;
|
uint64_t hyperv_features;
|
||||||
bool hyperv_passthrough;
|
bool hyperv_passthrough;
|
||||||
OnOffAuto hyperv_no_nonarch_cs;
|
OnOffAuto hyperv_no_nonarch_cs;
|
||||||
|
uint32_t hyperv_vendor_id[3];
|
||||||
|
|
||||||
bool check_cpuid;
|
bool check_cpuid;
|
||||||
bool enforce_cpuid;
|
bool enforce_cpuid;
|
||||||
|
|
|
@ -1208,6 +1208,13 @@ static int hyperv_handle_properties(CPUState *cs,
|
||||||
memcpy(cpuid_ent, &cpuid->entries[0],
|
memcpy(cpuid_ent, &cpuid->entries[0],
|
||||||
cpuid->nent * sizeof(cpuid->entries[0]));
|
cpuid->nent * sizeof(cpuid->entries[0]));
|
||||||
|
|
||||||
|
c = cpuid_find_entry(cpuid, HV_CPUID_VENDOR_AND_MAX_FUNCTIONS, 0);
|
||||||
|
if (c) {
|
||||||
|
cpu->hyperv_vendor_id[0] = c->ebx;
|
||||||
|
cpu->hyperv_vendor_id[1] = c->ecx;
|
||||||
|
cpu->hyperv_vendor_id[2] = 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;
|
||||||
|
@ -1282,23 +1289,11 @@ static int hyperv_handle_properties(CPUState *cs,
|
||||||
|
|
||||||
c = &cpuid_ent[cpuid_i++];
|
c = &cpuid_ent[cpuid_i++];
|
||||||
c->function = HV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
|
c->function = HV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
|
||||||
if (!cpu->hyperv_vendor_id) {
|
|
||||||
memcpy(signature, "Microsoft Hv", 12);
|
|
||||||
} else {
|
|
||||||
size_t len = strlen(cpu->hyperv_vendor_id);
|
|
||||||
|
|
||||||
if (len > 12) {
|
|
||||||
error_report("hv-vendor-id truncated to 12 characters");
|
|
||||||
len = 12;
|
|
||||||
}
|
|
||||||
memset(signature, 0, 12);
|
|
||||||
memcpy(signature, cpu->hyperv_vendor_id, len);
|
|
||||||
}
|
|
||||||
c->eax = hyperv_feat_enabled(cpu, HYPERV_FEAT_EVMCS) ?
|
c->eax = hyperv_feat_enabled(cpu, HYPERV_FEAT_EVMCS) ?
|
||||||
HV_CPUID_NESTED_FEATURES : HV_CPUID_IMPLEMENT_LIMITS;
|
HV_CPUID_NESTED_FEATURES : HV_CPUID_IMPLEMENT_LIMITS;
|
||||||
c->ebx = signature[0];
|
c->ebx = cpu->hyperv_vendor_id[0];
|
||||||
c->ecx = signature[1];
|
c->ecx = cpu->hyperv_vendor_id[1];
|
||||||
c->edx = signature[2];
|
c->edx = cpu->hyperv_vendor_id[2];
|
||||||
|
|
||||||
c = &cpuid_ent[cpuid_i++];
|
c = &cpuid_ent[cpuid_i++];
|
||||||
c->function = HV_CPUID_INTERFACE;
|
c->function = HV_CPUID_INTERFACE;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue