[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 4/9] i386: make hyperv_expand_features() return bool
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH v7 4/9] i386: make hyperv_expand_features() return bool |
Date: |
Thu, 3 Jun 2021 13:48:30 +0200 |
Return 'false' when hyperv_expand_features() sets an error.
No functional change intended.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
target/i386/kvm/kvm.c | 40 +++++++++++++++++++++-------------------
1 file changed, 21 insertions(+), 19 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index d57eede5dc81..a5f8553af921 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -1217,12 +1217,12 @@ static uint32_t hv_build_cpuid_leaf(CPUState *cs,
uint32_t func, int reg)
* of 'hv_passthrough' mode and fills the environment with all supported
* Hyper-V features.
*/
-static void hyperv_expand_features(CPUState *cs, Error **errp)
+static bool hyperv_expand_features(CPUState *cs, Error **errp)
{
X86CPU *cpu = X86_CPU(cs);
if (!hyperv_enabled(cpu))
- return;
+ return true;
if (cpu->hyperv_passthrough) {
cpu->hyperv_vendor_id[0] =
@@ -1270,49 +1270,49 @@ static void hyperv_expand_features(CPUState *cs, Error
**errp)
/* Features */
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_RELAXED, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_VAPIC, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_TIME, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_CRASH, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_RESET, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_VPINDEX, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_RUNTIME, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_SYNIC, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_STIMER, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_FREQUENCIES, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_REENLIGHTENMENT, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_TLBFLUSH, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_EVMCS, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_IPI, errp)) {
- return;
+ return false;
}
if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_STIMER_DIRECT, errp)) {
- return;
+ return false;
}
/* Additional dependencies not covered by kvm_hyperv_properties[] */
@@ -1322,7 +1322,10 @@ static void hyperv_expand_features(CPUState *cs, Error
**errp)
error_setg(errp, "Hyper-V %s requires Hyper-V %s",
kvm_hyperv_properties[HYPERV_FEAT_SYNIC].desc,
kvm_hyperv_properties[HYPERV_FEAT_VPINDEX].desc);
+ return false;
}
+
+ return true;
}
/*
@@ -1563,8 +1566,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
env->apic_bus_freq = KVM_APIC_BUS_FREQUENCY;
/* Paravirtualization CPUIDs */
- hyperv_expand_features(cs, &local_err);
- if (local_err) {
+ if (!hyperv_expand_features(cs, &local_err)) {
error_report_err(local_err);
return -ENOSYS;
}
--
2.31.1
[PATCH v7 2/9] i386: clarify 'hv-passthrough' behavior, Vitaly Kuznetsov, 2021/06/03
[PATCH v7 4/9] i386: make hyperv_expand_features() return bool,
Vitaly Kuznetsov <=
[PATCH v7 5/9] i386: expand Hyper-V features during CPU feature expansion time, Vitaly Kuznetsov, 2021/06/03
[PATCH v7 6/9] i386: kill off hv_cpuid_check_and_set(), Vitaly Kuznetsov, 2021/06/03
[PATCH v7 7/9] i386: HV_HYPERCALL_AVAILABLE privilege bit is always needed, Vitaly Kuznetsov, 2021/06/03
[PATCH v7 8/9] i386: Hyper-V SynIC requires POST_MESSAGES/SIGNAL_EVENTS priviliges, Vitaly Kuznetsov, 2021/06/03