[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/17] i386: move hyperv_version_id initialization to x86_cpu_real
From: |
Eduardo Habkost |
Subject: |
[PULL 09/17] i386: move hyperv_version_id initialization to x86_cpu_realizefn() |
Date: |
Thu, 17 Dec 2020 13:46:12 -0500 |
From: Vitaly Kuznetsov <vkuznets@redhat.com>
As a preparation to expanding Hyper-V CPU features early, move
hyperv_version_id initialization to x86_cpu_realizefn().
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20201119103221.1665171-4-vkuznets@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/cpu.h | 1 +
target/i386/cpu.c | 4 ++++
target/i386/kvm/kvm.c | 14 ++++++++++++--
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index fd29afebc9..adce57dc78 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1666,6 +1666,7 @@ struct X86CPU {
OnOffAuto hyperv_no_nonarch_cs;
uint32_t hyperv_vendor_id[3];
uint32_t hyperv_interface_id[4];
+ uint32_t hyperv_version_id[4];
bool check_cpuid;
bool enforce_cpuid;
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ab10c0225d..6c5b0fef79 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6567,6 +6567,10 @@ static void x86_cpu_hyperv_realize(X86CPU *cpu)
cpu->hyperv_interface_id[1] = 0;
cpu->hyperv_interface_id[2] = 0;
cpu->hyperv_interface_id[3] = 0;
+
+ /* Hypervisor system identity */
+ cpu->hyperv_version_id[0] = 0x00001bbc;
+ cpu->hyperv_version_id[1] = 0x00060001;
}
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index d3aa7ca281..db2069406d 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -1222,6 +1222,14 @@ static int hyperv_handle_properties(CPUState *cs,
cpu->hyperv_interface_id[3] = c->edx;
}
+ c = cpuid_find_entry(cpuid, HV_CPUID_VERSION, 0);
+ if (c) {
+ cpu->hyperv_version_id[0] = c->eax;
+ cpu->hyperv_version_id[1] = c->ebx;
+ cpu->hyperv_version_id[2] = c->ecx;
+ cpu->hyperv_version_id[3] = c->edx;
+ }
+
c = cpuid_find_entry(cpuid, HV_CPUID_FEATURES, 0);
if (c) {
env->features[FEAT_HYPERV_EAX] = c->eax;
@@ -1311,8 +1319,10 @@ static int hyperv_handle_properties(CPUState *cs,
c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_VERSION;
- c->eax = 0x00001bbc;
- c->ebx = 0x00060001;
+ c->eax = cpu->hyperv_version_id[0];
+ c->ebx = cpu->hyperv_version_id[1];
+ c->ecx = cpu->hyperv_version_id[2];
+ c->edx = cpu->hyperv_version_id[3];
c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_FEATURES;
--
2.28.0
- [PULL 05/17] i386: move TCG accel files into tcg/, (continued)
- [PULL 05/17] i386: move TCG accel files into tcg/, Eduardo Habkost, 2020/12/17
- [PULL 06/17] i386: move cpu dump out of helper.c into cpu-dump.c, Eduardo Habkost, 2020/12/17
- [PULL 07/17] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Eduardo Habkost, 2020/12/17
- Re: [PULL 07/17] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Claudio Fontana, 2020/12/17
- Re: [PULL 07/17] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Eduardo Habkost, 2020/12/17
- Re: [PULL 07/17] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Claudio Fontana, 2020/12/17
- Re: [PULL 07/17] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Eduardo Habkost, 2020/12/17
- Re: [PULL 07/17] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Claudio Fontana, 2020/12/17
- Re: [PULL 07/17] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Eduardo Habkost, 2020/12/17
- Re: [PULL 07/17] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Claudio Fontana, 2020/12/18
[PULL 09/17] i386: move hyperv_version_id initialization to x86_cpu_realizefn(),
Eduardo Habkost <=
[PULL 08/17] i386: move hyperv_interface_id initialization to x86_cpu_realizefn(), Eduardo Habkost, 2020/12/17
[PULL 13/17] i386: tcg: remove inline from cpu_load_eflags, Eduardo Habkost, 2020/12/17
[PULL 10/17] i386: move hyperv_limits initialization to x86_cpu_realizefn(), Eduardo Habkost, 2020/12/17
[PULL 12/17] i386: move TCG cpu class initialization to tcg/, Eduardo Habkost, 2020/12/17
[PULL 15/17] tcg: make CPUClass.cpu_exec_* optional, Eduardo Habkost, 2020/12/17
[PULL 11/17] x86/cpu: Add AVX512_FP16 cpu feature, Eduardo Habkost, 2020/12/17
[PULL 14/17] tcg: cpu_exec_{enter,exit} helpers, Eduardo Habkost, 2020/12/17
[PULL 17/17] cpu: Remove unnecessary noop methods, Eduardo Habkost, 2020/12/17
[PULL 16/17] tcg: Make CPUClass.debug_excp_handler optional, Eduardo Habkost, 2020/12/17
Re: [PULL 00/17] x86 queue, 2020-12-17, Peter Maydell, 2020/12/17