Commit 78588335 authored by Markus Elfring's avatar Markus Elfring Committed by Paolo Bonzini

kvm_main: Use common error handling code in kvm_dev_ioctl_create_vm()

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.
Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 52797bf9
...@@ -3186,21 +3186,18 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) ...@@ -3186,21 +3186,18 @@ static int kvm_dev_ioctl_create_vm(unsigned long type)
return PTR_ERR(kvm); return PTR_ERR(kvm);
#ifdef CONFIG_KVM_MMIO #ifdef CONFIG_KVM_MMIO
r = kvm_coalesced_mmio_init(kvm); r = kvm_coalesced_mmio_init(kvm);
if (r < 0) { if (r < 0)
kvm_put_kvm(kvm); goto put_kvm;
return r;
}
#endif #endif
r = get_unused_fd_flags(O_CLOEXEC); r = get_unused_fd_flags(O_CLOEXEC);
if (r < 0) { if (r < 0)
kvm_put_kvm(kvm); goto put_kvm;
return r;
}
file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); file = anon_inode_getfile("kvm-vm", &kvm_vm_fops, kvm, O_RDWR);
if (IS_ERR(file)) { if (IS_ERR(file)) {
put_unused_fd(r); put_unused_fd(r);
kvm_put_kvm(kvm); r = PTR_ERR(file);
return PTR_ERR(file); goto put_kvm;
} }
/* /*
...@@ -3218,6 +3215,10 @@ static int kvm_dev_ioctl_create_vm(unsigned long type) ...@@ -3218,6 +3215,10 @@ static int kvm_dev_ioctl_create_vm(unsigned long type)
fd_install(r, file); fd_install(r, file);
return r; return r;
put_kvm:
kvm_put_kvm(kvm);
return r;
} }
static long kvm_dev_ioctl(struct file *filp, static long kvm_dev_ioctl(struct file *filp,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment