[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/8] i386: Move HV_APIC_ACCESS_RECOMMENDED bit setting to hype
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH v2 5/8] i386: Move HV_APIC_ACCESS_RECOMMENDED bit setting to hyperv_fill_cpuids() |
Date: |
Thu, 2 Sep 2021 11:35:27 +0200 |
In preparation to enabling Hyper-V + APICv/AVIC move
HV_APIC_ACCESS_RECOMMENDED setting out of kvm_hyperv_properties[]: the
'real' feature bit for the vAPIC features is HV_APIC_ACCESS_AVAILABLE,
HV_APIC_ACCESS_RECOMMENDED is a recommendation to use the feature which
we may not always want to give.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
target/i386/kvm/kvm.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index bd0b53416315..430007c2691a 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -821,9 +821,7 @@ static struct {
.desc = "virtual APIC (hv-vapic)",
.flags = {
{.func = HV_CPUID_FEATURES, .reg = R_EAX,
- .bits = HV_APIC_ACCESS_AVAILABLE},
- {.func = HV_CPUID_ENLIGHTMENT_INFO, .reg = R_EAX,
- .bits = HV_APIC_ACCESS_RECOMMENDED}
+ .bits = HV_APIC_ACCESS_AVAILABLE}
}
},
[HYPERV_FEAT_TIME] = {
@@ -1366,6 +1364,7 @@ static int hyperv_fill_cpuids(CPUState *cs,
c->ebx |= HV_POST_MESSAGES | HV_SIGNAL_EVENTS;
}
+
/* Not exposed by KVM but needed to make CPU hotplug in Windows work */
c->edx |= HV_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
@@ -1374,6 +1373,10 @@ static int hyperv_fill_cpuids(CPUState *cs,
c->eax = hv_build_cpuid_leaf(cs, HV_CPUID_ENLIGHTMENT_INFO, R_EAX);
c->ebx = cpu->hyperv_spinlock_attempts;
+ if (hyperv_feat_enabled(cpu, HYPERV_FEAT_VAPIC)) {
+ c->eax |= HV_APIC_ACCESS_RECOMMENDED;
+ }
+
if (cpu->hyperv_no_nonarch_cs == ON_OFF_AUTO_ON) {
c->eax |= HV_NO_NONARCH_CORESHARING;
} else if (cpu->hyperv_no_nonarch_cs == ON_OFF_AUTO_AUTO) {
--
2.31.1
- [PATCH v2 0/8] i386: Assorted KVM PV and Hyper-V feature improvements, Vitaly Kuznetsov, 2021/09/02
- [PATCH v2 2/8] i386: docs: Briefly describe KVM PV features, Vitaly Kuznetsov, 2021/09/02
- [PATCH v2 6/8] i386: Implement pseudo 'hv-avic' ('hv-apicv') enlightenment, Vitaly Kuznetsov, 2021/09/02
- [PATCH v2 1/8] i386: Add 6.2 machine types, Vitaly Kuznetsov, 2021/09/02
- [PATCH v2 7/8] i386: Make Hyper-V version id configurable, Vitaly Kuznetsov, 2021/09/02
- [PATCH v2 8/8] i386: Change the default Hyper-V version to match WS2016, Vitaly Kuznetsov, 2021/09/02
- [PATCH v2 5/8] i386: Move HV_APIC_ACCESS_RECOMMENDED bit setting to hyperv_fill_cpuids(),
Vitaly Kuznetsov <=
- [PATCH v2 4/8] i386: Support KVM_CAP_HYPERV_ENFORCE_CPUID, Vitaly Kuznetsov, 2021/09/02
- [PATCH v2 3/8] i386: Support KVM_CAP_ENFORCE_PV_FEATURE_CPUID, Vitaly Kuznetsov, 2021/09/02
- Re: [PATCH v2 0/8] i386: Assorted KVM PV and Hyper-V feature improvements, Vitaly Kuznetsov, 2021/09/17
- Re: [PATCH v2 0/8] i386: Assorted KVM PV and Hyper-V feature improvements, Paolo Bonzini, 2021/09/29