[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 50/53] target/i386/kvm: Simplify kvm_get_supported_[feature]_msrs(
From: |
Paolo Bonzini |
Subject: |
[PULL 50/53] target/i386/kvm: Simplify kvm_get_supported_[feature]_msrs() |
Date: |
Mon, 6 Jul 2020 12:41:52 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
As the MSR supported features should be the same for all
VMs, it is safe to directly use the global kvm_state.
Remove the unnecessary KVMState* argument.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200623105052.1700-8-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/kvm.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index cfb6bc15aa..a19a1e6769 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1919,7 +1919,7 @@ void kvm_arch_do_init_vcpu(X86CPU *cpu)
}
}
-static int kvm_get_supported_feature_msrs(KVMState *s)
+static int kvm_get_supported_feature_msrs(void)
{
int ret = 0;
@@ -1934,7 +1934,7 @@ static int kvm_get_supported_feature_msrs(KVMState *s)
struct kvm_msr_list msr_list;
msr_list.nmsrs = 0;
- ret = kvm_ioctl(s, KVM_GET_MSR_FEATURE_INDEX_LIST, &msr_list);
+ ret = kvm_ioctl(kvm_state, KVM_GET_MSR_FEATURE_INDEX_LIST, &msr_list);
if (ret < 0 && ret != -E2BIG) {
error_report("Fetch KVM feature MSR list failed: %s",
strerror(-ret));
@@ -1947,7 +1947,8 @@ static int kvm_get_supported_feature_msrs(KVMState *s)
msr_list.nmsrs * sizeof(msr_list.indices[0]));
kvm_feature_msrs->nmsrs = msr_list.nmsrs;
- ret = kvm_ioctl(s, KVM_GET_MSR_FEATURE_INDEX_LIST, kvm_feature_msrs);
+ ret = kvm_ioctl(kvm_state, KVM_GET_MSR_FEATURE_INDEX_LIST,
+ kvm_feature_msrs);
if (ret < 0) {
error_report("Fetch KVM feature MSR list failed: %s",
@@ -1960,7 +1961,7 @@ static int kvm_get_supported_feature_msrs(KVMState *s)
return 0;
}
-static int kvm_get_supported_msrs(KVMState *s)
+static int kvm_get_supported_msrs(void)
{
int ret = 0;
struct kvm_msr_list msr_list, *kvm_msr_list;
@@ -1970,7 +1971,7 @@ static int kvm_get_supported_msrs(KVMState *s)
* save/restore.
*/
msr_list.nmsrs = 0;
- ret = kvm_ioctl(s, KVM_GET_MSR_INDEX_LIST, &msr_list);
+ ret = kvm_ioctl(kvm_state, KVM_GET_MSR_INDEX_LIST, &msr_list);
if (ret < 0 && ret != -E2BIG) {
return ret;
}
@@ -1983,7 +1984,7 @@ static int kvm_get_supported_msrs(KVMState *s)
sizeof(msr_list.indices[0])));
kvm_msr_list->nmsrs = msr_list.nmsrs;
- ret = kvm_ioctl(s, KVM_GET_MSR_INDEX_LIST, kvm_msr_list);
+ ret = kvm_ioctl(kvm_state, KVM_GET_MSR_INDEX_LIST, kvm_msr_list);
if (ret >= 0) {
int i;
@@ -2139,12 +2140,12 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
}
}
- ret = kvm_get_supported_msrs(s);
+ ret = kvm_get_supported_msrs();
if (ret < 0) {
return ret;
}
- kvm_get_supported_feature_msrs(s);
+ kvm_get_supported_feature_msrs();
uname(&utsname);
lm_capable_kernel = strcmp(utsname.machine, "x86_64") == 0;
--
2.26.2
- Re: [PULL 28/53] Makefile: simplify MINIKCONF rules, (continued)
[PULL 36/53] chardev/tcp: fix error message double free error, Paolo Bonzini, 2020/07/06
[PULL 48/53] target/i386/kvm: Simplify get_para_features(), Paolo Bonzini, 2020/07/06
[PULL 44/53] softmmu/vl: Remove the check for colons in -accel parameters, Paolo Bonzini, 2020/07/06
[PULL 52/53] target/i386: Enable TSX Suspend Load Address Tracking feature, Paolo Bonzini, 2020/07/06
[PULL 51/53] target/i386: Add SERIALIZE cpu feature, Paolo Bonzini, 2020/07/06
[PULL 34/53] iscsi: handle check condition status in retry loop, Paolo Bonzini, 2020/07/06
[PULL 50/53] target/i386/kvm: Simplify kvm_get_supported_[feature]_msrs(),
Paolo Bonzini <=
[PULL 42/53] cpu-throttle: new module, extracted from cpus.c, Paolo Bonzini, 2020/07/06
[PULL 43/53] cpu-timers, icount: new modules, Paolo Bonzini, 2020/07/06
[PULL 39/53] cpus: Move CPU code from exec.c to cpus-common.c, Paolo Bonzini, 2020/07/06
Re: [PULL 00/53] Misc patches for QEMU 5.1 soft freeze, no-reply, 2020/07/06
Re: [PULL 00/53] Misc patches for QEMU 5.1 soft freeze, Peter Maydell, 2020/07/07