[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/24] i386: keep hyperv_vendor string up-to-date
From: |
Eduardo Habkost |
Subject: |
[PULL 08/24] i386: keep hyperv_vendor string up-to-date |
Date: |
Tue, 1 Jun 2021 14:09:58 -0400 |
From: Vitaly Kuznetsov <vkuznets@redhat.com>
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>
---
target/i386/cpu.c | 19 +++++++++----------
target/i386/kvm/kvm.c | 5 +++++
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index d150378c400..48dabc5238a 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -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 {
- 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/kvm.c b/target/i386/kvm/kvm.c
index d972eb4705b..ce02cb6713c 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -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);
--
2.30.2
- [PULL 00/24] x86 queue, 2021-06-01, Eduardo Habkost, 2021/06/01
- [PULL 01/24] target/i386: Add CPU model versions supporting 'xsaves', Eduardo Habkost, 2021/06/01
- [PULL 02/24] i386: Document when features can be added to kvm_default_props, Eduardo Habkost, 2021/06/01
- [PULL 03/24] target/i386/cpu: Constify CPUCaches, Eduardo Habkost, 2021/06/01
- [PULL 04/24] target/i386/cpu: Constify X86CPUDefinition, Eduardo Habkost, 2021/06/01
- [PULL 05/24] i386/cpu_dump: support AVX512 ZMM regs dump, Eduardo Habkost, 2021/06/01
- [PULL 07/24] i386: use better matching family/model/stepping for 'max' CPU, Eduardo Habkost, 2021/06/01
- [PULL 06/24] i386: use better matching family/model/stepping for 'qemu64' CPU, Eduardo Habkost, 2021/06/01
- [PULL 10/24] i386: always fill Hyper-V CPUID feature leaves from X86CPU data, Eduardo Habkost, 2021/06/01
- [PULL 09/24] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, Eduardo Habkost, 2021/06/01
- [PULL 08/24] i386: keep hyperv_vendor string up-to-date,
Eduardo Habkost <=
- [PULL 11/24] i386: stop using env->features[] for filling Hyper-V CPUIDs, Eduardo Habkost, 2021/06/01
- [PULL 13/24] i386: introduce hv_cpuid_get_host(), Eduardo Habkost, 2021/06/01
- [PULL 12/24] i386: introduce hyperv_feature_supported(), Eduardo Habkost, 2021/06/01
- [PULL 14/24] i386: drop FEAT_HYPERV feature leaves, Eduardo Habkost, 2021/06/01
- [PULL 17/24] i386: move eVMCS enablement to hyperv_init_vcpu(), Eduardo Habkost, 2021/06/01
- [PULL 20/24] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one, Eduardo Habkost, 2021/06/01
- [PULL 21/24] i386: use global kvm_state in hyperv_enabled() check, Eduardo Habkost, 2021/06/01
- [PULL 16/24] i386: split hyperv_handle_properties() into hyperv_expand_features()/hyperv_fill_cpuids(), Eduardo Habkost, 2021/06/01
- [PULL 23/24] sev: use explicit indices for mapping firmware error codes to strings, Eduardo Habkost, 2021/06/01
- [PULL 15/24] i386: introduce hv_cpuid_cache, Eduardo Habkost, 2021/06/01