i386: keep hyperv_vendor string up-to-date
When cpu->hyperv_vendor is not set manually we default to "Microsoft Hv" and in 'hv_passthrough' mode we get the information from the host. This information is stored in cpu->hyperv_vendor_id[] array but we don't update cpu->hyperv_vendor string so e.g. QMP's query-cpu-model-expansion output is incorrect. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <20210422161130.652779-2-vkuznets@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
40b3cc354a
commit
4519259a34
|
@ -6141,17 +6141,16 @@ static void x86_cpu_hyperv_realize(X86CPU *cpu)
|
|||
|
||||
/* Hyper-V vendor id */
|
||||
if (!cpu->hyperv_vendor) {
|
||||
memcpy(cpu->hyperv_vendor_id, "Microsoft Hv", 12);
|
||||
} else {
|
||||
object_property_set_str(OBJECT(cpu), "hv-vendor-id", "Microsoft Hv",
|
||||
&error_abort);
|
||||
}
|
||||
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);
|
||||
}
|
||||
|
||||
/* 'Hv#1' interface identification*/
|
||||
cpu->hyperv_interface_id[0] = 0x31237648;
|
||||
|
|
|
@ -1216,6 +1216,11 @@ static int hyperv_handle_properties(CPUState *cs,
|
|||
cpu->hyperv_vendor_id[0] = c->ebx;
|
||||
cpu->hyperv_vendor_id[1] = c->ecx;
|
||||
cpu->hyperv_vendor_id[2] = c->edx;
|
||||
cpu->hyperv_vendor = g_realloc(cpu->hyperv_vendor,
|
||||
sizeof(cpu->hyperv_vendor_id) + 1);
|
||||
memcpy(cpu->hyperv_vendor, cpu->hyperv_vendor_id,
|
||||
sizeof(cpu->hyperv_vendor_id));
|
||||
cpu->hyperv_vendor[sizeof(cpu->hyperv_vendor_id)] = 0;
|
||||
}
|
||||
|
||||
c = cpuid_find_entry(cpuid, HV_CPUID_INTERFACE, 0);
|
||||
|
|
Loading…
Reference in a new issue