summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiaohe Lin <linmiaohe@huawei.com>2019-11-09 16:08:20 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2019-11-15 11:44:01 +0100
commitb139b5a24774ee28e3e4d22942e2bede28d48202 (patch)
tree0f89a048daf91270762235a820715ecd9afa77d6
parente64a8508234afb17a15d1aa98e8c1434fc207755 (diff)
downloadlinux-stable-b139b5a24774ee28e3e4d22942e2bede28d48202.tar.gz
linux-stable-b139b5a24774ee28e3e4d22942e2bede28d48202.tar.bz2
linux-stable-b139b5a24774ee28e3e4d22942e2bede28d48202.zip
KVM: MMIO: get rid of odd out_err label in kvm_coalesced_mmio_init
The out_err label and var ret is unnecessary, clean them up. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--virt/kvm/coalesced_mmio.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c
index 8ffd07e2a160..00c747dbc82e 100644
--- a/virt/kvm/coalesced_mmio.c
+++ b/virt/kvm/coalesced_mmio.c
@@ -110,14 +110,11 @@ static const struct kvm_io_device_ops coalesced_mmio_ops = {
int kvm_coalesced_mmio_init(struct kvm *kvm)
{
struct page *page;
- int ret;
- ret = -ENOMEM;
page = alloc_page(GFP_KERNEL | __GFP_ZERO);
if (!page)
- goto out_err;
+ return -ENOMEM;
- ret = 0;
kvm->coalesced_mmio_ring = page_address(page);
/*
@@ -128,8 +125,7 @@ int kvm_coalesced_mmio_init(struct kvm *kvm)
spin_lock_init(&kvm->ring_lock);
INIT_LIST_HEAD(&kvm->coalesced_zones);
-out_err:
- return ret;
+ return 0;
}
void kvm_coalesced_mmio_free(struct kvm *kvm)