diff options
| author | Christoffer Dall | 2017-12-04 21:35:29 +0100 |
|---|---|---|
| committer | Paolo Bonzini | 2017-12-14 09:26:53 +0100 |
| commit | b4ef9d4e8cb8938e6c0aa3be672b0aeeb791ecf3 (patch) | |
| tree | a2fb79c430dd1d7b533722b04d9c6f69f75ee9e5 /arch/x86/kvm/x86.c | |
| parent | KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_get_sregs (diff) | |
| download | kernel-qcow2-linux-b4ef9d4e8cb8938e6c0aa3be672b0aeeb791ecf3.tar.gz kernel-qcow2-linux-b4ef9d4e8cb8938e6c0aa3be672b0aeeb791ecf3.tar.xz kernel-qcow2-linux-b4ef9d4e8cb8938e6c0aa3be672b0aeeb791ecf3.zip | |
KVM: Move vcpu_load to arch-specific kvm_arch_vcpu_ioctl_set_sregs
Move vcpu_load() and vcpu_put() into the architecture specific
implementations of kvm_arch_vcpu_ioctl_set_sregs().
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 66a8d8cd00f6..f01a7d73dad7 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7525,15 +7525,18 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, int mmu_reset_needed = 0; int pending_vec, max_bits, idx; struct desc_ptr dt; + int ret = -EINVAL; + + vcpu_load(vcpu); if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) && (sregs->cr4 & X86_CR4_OSXSAVE)) - return -EINVAL; + goto out; apic_base_msr.data = sregs->apic_base; apic_base_msr.host_initiated = true; if (kvm_set_apic_base(vcpu, &apic_base_msr)) - return -EINVAL; + goto out; dt.size = sregs->idt.limit; dt.address = sregs->idt.base; @@ -7599,7 +7602,10 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, kvm_make_request(KVM_REQ_EVENT, vcpu); - return 0; + ret = 0; +out: + vcpu_put(vcpu); + return ret; } int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, |