[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/5] i386: move hyperv_interface_id initialization to x86_cpu_rea
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH 2/5] i386: move hyperv_interface_id initialization to x86_cpu_realizefn() |
Date: |
Thu, 19 Nov 2020 11:32:18 +0100 |
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 2a6885753378..18a73ca4708b 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6526,6 +6526,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 be640bf45c29..1f30d642007c 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 788a2cf2ec51..eb09766ec9b7 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1168,7 +1168,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;
@@ -1212,6 +1211,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;
@@ -1294,11 +1301,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.26.2
- [PATCH 0/5] i386: simplify Hyper-V enlightenments enablement, Vitaly Kuznetsov, 2020/11/19
- [PATCH 1/5] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/11/19
- [PATCH 2/5] i386: move hyperv_interface_id initialization to x86_cpu_realizefn(),
Vitaly Kuznetsov <=
- [PATCH 3/5] i386: move hyperv_version_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/11/19
- [PATCH 4/5] i386: move hyperv_limits initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/11/19
- [PATCH 5/5] i386: provide simple 'hyperv=on' option to x86 machine types, Vitaly Kuznetsov, 2020/11/19
- Re: [PATCH 0/5] i386: simplify Hyper-V enlightenments enablement, Claudio Fontana, 2020/11/19