diff options
| author | Paolo Bonzini | 2014-09-16 13:37:40 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-09-24 14:07:48 +0200 |
| commit | 1f755a827538226fff38aad128c4a6836bd89b48 (patch) | |
| tree | 5ec9ecfc04c732e3de01ef786c8baeb8bc52b6fa /arch/x86/kvm/vmx.c | |
| parent | KVM: x86: Warn if guest virtual address space is not 48-bits (diff) | |
| download | kernel-qcow2-linux-1f755a827538226fff38aad128c4a6836bd89b48.tar.gz kernel-qcow2-linux-1f755a827538226fff38aad128c4a6836bd89b48.tar.xz kernel-qcow2-linux-1f755a827538226fff38aad128c4a6836bd89b48.zip | |
kvm: Make init_rmode_tss() return 0 on success.
In init_rmode_tss(), there two variables indicating the return
value, r and ret, and it return 0 on error, 1 on success. The function
is only called by vmx_set_tss_addr(), and ret is redundant.
This patch removes the redundant variable, by making init_rmode_tss()
return 0 on success, -errno on failure.
Reviewed-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 6ffd643d1a64..e8f08e91592d 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3930,7 +3930,7 @@ static int init_rmode_tss(struct kvm *kvm) { gfn_t fn; u16 data = 0; - int r, idx, ret = 0; + int idx, r; idx = srcu_read_lock(&kvm->srcu); fn = kvm->arch.tss_addr >> PAGE_SHIFT; @@ -3952,13 +3952,9 @@ static int init_rmode_tss(struct kvm *kvm) r = kvm_write_guest_page(kvm, fn, &data, RMODE_TSS_SIZE - 2 * PAGE_SIZE - 1, sizeof(u8)); - if (r < 0) - goto out; - - ret = 1; out: srcu_read_unlock(&kvm->srcu, idx); - return ret; + return r; } static int init_rmode_identity_map(struct kvm *kvm) @@ -4751,10 +4747,7 @@ static int vmx_set_tss_addr(struct kvm *kvm, unsigned int addr) if (ret) return ret; kvm->arch.tss_addr = addr; - if (!init_rmode_tss(kvm)) - return -ENOMEM; - - return 0; + return init_rmode_tss(kvm); } static bool rmode_exception(struct kvm_vcpu *vcpu, int vec) |