[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC 16/22] i386: make hyperv_expand_features() return void
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH RFC 16/22] i386: make hyperv_expand_features() return void |
Date: |
Fri, 4 Sep 2020 16:54:25 +0200 |
As hyperv_expand_features() now uses standard error_setg() mechanism
we can make it return void.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
target/i386/kvm.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 760b93091fea..cb35f759acaa 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1198,16 +1198,15 @@ static int hv_cpuid_check_and_set(CPUState *cs, struct
kvm_cpuid2 *cpuid,
* of 'hv_passthrough' mode and fills the environment with all supported
* Hyper-V features.
*/
-static int hyperv_expand_features(CPUState *cs, Error **errp)
+static void hyperv_expand_features(CPUState *cs, Error **errp)
{
X86CPU *cpu = X86_CPU(cs);
CPUX86State *env = &cpu->env;
struct kvm_cpuid2 *cpuid;
struct kvm_cpuid_entry2 *c;
- int r = 1;
if (!hyperv_enabled(cpu))
- return 0;
+ return;
if (kvm_check_extension(cs->kvm_state, KVM_CAP_HYPERV_CPUID) > 0) {
cpuid = get_supported_hv_cpuid(cs);
@@ -1341,17 +1340,12 @@ static int hyperv_expand_features(CPUState *cs, Error
**errp)
/* Not exposed by KVM but needed to make CPU hotplug in Windows work */
env->features[FEAT_HYPERV_EDX] |= HV_CPU_DYNAMIC_PARTITIONING_AVAILABLE;
- r = 0;
out:
g_free(cpuid);
- if (r) {
- return -ENOSYS;
- }
-
- return 0;
+ return;
}
/*
@@ -1584,10 +1578,10 @@ int kvm_arch_init_vcpu(CPUState *cs)
env->apic_bus_freq = KVM_APIC_BUS_FREQUENCY;
/* Paravirtualization CPUIDs */
- r = hyperv_expand_features(cs, &local_err);
+ hyperv_expand_features(cs, &local_err);
if (local_err) {
error_report_err(local_err);
- return r;
+ return -ENOSYS;
}
if (hyperv_enabled(cpu)) {
--
2.25.4
- Re: [PATCH RFC 12/22] i386: always fill Hyper-V CPUID feature leaves from X86CPU data, (continued)
- [PATCH RFC 15/22] i386: switch hyperv_expand_features() to using error_setg(), Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 18/22] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 22/22] i386: expand Hyper-V features early, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 21/22] i386: record if Hyper-V features were already expanded, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 19/22] i386: prepare hyperv_expand_features() to be called at CPU feature expansion time, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 16/22] i386: make hyperv_expand_features() return void,
Vitaly Kuznetsov <=
- [PATCH RFC 17/22] i386: adjust the expected KVM_GET_SUPPORTED_HV_CPUID array size, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 20/22] i386: use global kvm_state in hyperv_enabled() check, Vitaly Kuznetsov, 2020/09/04