hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
This commit is contained in:
Markus Elfring 2017-11-21 13:40:17 +01:00 committed by Paolo Bonzini
parent 52797bf9a8
commit 7858833506
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
virt/kvm/kvm_main.c
View File

@ -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)
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,