[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC v3 05/23] i386: move hyperv_interface_id initialization to x8
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH RFC v3 05/23] i386: move hyperv_interface_id initialization to x86_cpu_realizefn() |
Date: |
Fri, 9 Oct 2020 14:18:24 +0200 |
As a preparation to expanding Hyper-V CPU features early, move
hyperv_interface_id initialization to x86_cpu_realizefn().
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
target/i386/cpu.c | 6 ++++++
target/i386/cpu.h | 1 +
target/i386/kvm.c | 18 ++++++++++++------
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ce485dd9afd9..52e050a7785c 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6507,6 +6507,12 @@ static void x86_cpu_hyperv_realize(X86CPU *cpu)
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;
+ cpu->hyperv_interface_id[1] = 0;
+ cpu->hyperv_interface_id[2] = 0;
+ cpu->hyperv_interface_id[3] = 0;
}
static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 2e7ee40372de..d49e34a80a34 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1661,6 +1661,7 @@ struct X86CPU {
bool hyperv_passthrough;
OnOffAuto hyperv_no_nonarch_cs;
uint32_t hyperv_vendor_id[3];
+ uint32_t hyperv_interface_id[4];
bool check_cpuid;
bool enforce_cpuid;
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 75d4cb17a5ba..eec0a7e31315 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1173,7 +1173,6 @@ static int hyperv_handle_properties(CPUState *cs,
CPUX86State *env = &cpu->env;
struct kvm_cpuid2 *cpuid;
struct kvm_cpuid_entry2 *c;
- uint32_t signature[3];
uint32_t cpuid_i = 0;
int r;
@@ -1217,6 +1216,14 @@ static int hyperv_handle_properties(CPUState *cs,
cpu->hyperv_vendor_id[2] = c->edx;
}
+ c = cpuid_find_entry(cpuid, HV_CPUID_INTERFACE, 0);
+ if (c) {
+ cpu->hyperv_interface_id[0] = c->eax;
+ cpu->hyperv_interface_id[1] = c->ebx;
+ cpu->hyperv_interface_id[2] = c->ecx;
+ cpu->hyperv_interface_id[3] = c->edx;
+ }
+
c = cpuid_find_entry(cpuid, HV_CPUID_FEATURES, 0);
if (c) {
env->features[FEAT_HYPERV_EAX] = c->eax;
@@ -1299,11 +1306,10 @@ static int hyperv_handle_properties(CPUState *cs,
c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_INTERFACE;
- memcpy(signature, "Hv#1\0\0\0\0\0\0\0\0", 12);
- c->eax = signature[0];
- c->ebx = 0;
- c->ecx = 0;
- c->edx = 0;
+ c->eax = cpu->hyperv_interface_id[0];
+ c->ebx = cpu->hyperv_interface_id[1];
+ c->ecx = cpu->hyperv_interface_id[2];
+ c->edx = cpu->hyperv_interface_id[3];
c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_VERSION;
--
2.25.4
- [PATCH RFC v3 00/23] i386: KVM: expand Hyper-V features early, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 01/23] WIP: update linux/headers, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 02/23] i386: fill in FEAT_HYPERV_EDX from edx instead of eax, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 03/23] i386: drop x86_cpu_get_supported_feature_word() forward declaration, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 04/23] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 08/23] i386: keep hyperv_vendor string up-to-date, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 10/23] i386: always fill Hyper-V CPUID feature leaves from X86CPU data, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 09/23] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 05/23] i386: move hyperv_interface_id initialization to x86_cpu_realizefn(),
Vitaly Kuznetsov <=
- [PATCH RFC v3 06/23] i386: move hyperv_version_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 07/23] i386: move hyperv_limits initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 13/23] i386: introduce hv_cpuid_get_host(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 12/23] i386: introduce hyperv_feature_supported(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 14/23] i386: drop FEAT_HYPERV feature leaves, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 15/23] i386: introduce hv_cpuid_cache, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 11/23] i386: stop using env->features[] for filling Hyper-V CPUIDs, Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 17/23] i386: move eVMCS enablement to hyperv_init_vcpu(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 18/23] i386: switch hyperv_expand_features() to using error_setg(), Vitaly Kuznetsov, 2020/10/09
- [PATCH RFC v3 16/23] i386: split hyperv_handle_properties() into hyperv_expand_features()/hyperv_fill_cpuids(), Vitaly Kuznetsov, 2020/10/09