[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC v2 08/19] i386: keep hyperv_vendor string up-to-date
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH RFC v2 08/19] i386: keep hyperv_vendor string up-to-date |
Date: |
Wed, 30 Sep 2020 15:40:16 +0200 |
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>
---
target/i386/cpu.c | 20 ++++++++++----------
target/i386/kvm.c | 4 ++++
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index d657590ab55d..8ec0af0a6d48 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6493,18 +6493,18 @@ 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);
+ 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;
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index afddc9a4a260..eb21f77be51b 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1229,6 +1229,10 @@ 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));
}
c = cpuid_find_entry(cpuid, HV_CPUID_INTERFACE, 0);
--
2.25.4
- [PATCH RFC v2 00/19] i386: KVM: expand Hyper-V features early, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 01/19] WIP: update linux/headers, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 02/19] i386: fill in FEAT_HYPERV_EDX from edx instead of eax, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 03/19] i386: drop x86_cpu_get_supported_feature_word() forward declaration, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 04/19] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 05/19] i386: move hyperv_interface_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 06/19] i386: move hyperv_version_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 10/19] i386: always fill Hyper-V CPUID feature leaves from X86CPU data, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 09/19] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 08/19] i386: keep hyperv_vendor string up-to-date,
Vitaly Kuznetsov <=
- [PATCH RFC v2 07/19] i386: move hyperv_limits initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 11/19] i386: introduce hv_cpuid_cache, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 12/19] i386: drop FEAT_HYPERV feature leaves, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 13/19] i386: split hyperv_handle_properties() into hyperv_expand_features()/hyperv_fill_cpuids(), Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 16/19] i386: adjust the expected KVM_GET_SUPPORTED_HV_CPUID array size, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 14/19] i386: move eVMCS enablement to hyperv_init_vcpu(), Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 19/19] i386: expand Hyper-V features during CPU feature expansion time, Vitaly Kuznetsov, 2020/09/30
- [PATCH RFC v2 17/19] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one, Vitaly Kuznetsov, 2020/09/30