From patchwork Wed Oct 27 15:22:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Carstens X-Patchwork-Id: 285952 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9RFMF7N006850 for ; Wed, 27 Oct 2010 15:22:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933657Ab0J0PWN (ORCPT ); Wed, 27 Oct 2010 11:22:13 -0400 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:59577 "EHLO mtagate1.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933639Ab0J0PWM (ORCPT ); Wed, 27 Oct 2010 11:22:12 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id o9RFMBgA009393 for ; Wed, 27 Oct 2010 15:22:11 GMT Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9RFMAtO3604648 for ; Wed, 27 Oct 2010 16:22:10 +0100 Received: from d06av03.portsmouth.uk.ibm.com (localhost.localdomain [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o9RFMAYA018661 for ; Wed, 27 Oct 2010 09:22:10 -0600 Received: from localhost (dyn-9-152-212-20.boeblingen.de.ibm.com [9.152.212.20]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o9RFMAIN018657; Wed, 27 Oct 2010 09:22:10 -0600 Date: Wed, 27 Oct 2010 17:22:10 +0200 From: Heiko Carstens To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH] kvm: get rid of warning within kvm_dev_ioctl_create_vm Message-ID: <20101027152210.GB4183@osiris.boeblingen.de.ibm.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 27 Oct 2010 15:22:15 +0000 (UTC) --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -1825,7 +1825,7 @@ static struct file_operations kvm_vm_fop static int kvm_dev_ioctl_create_vm(void) { - int fd, r; + int r; struct kvm *kvm; kvm = kvm_create_vm(); @@ -1838,11 +1838,11 @@ static int kvm_dev_ioctl_create_vm(void) return r; } #endif - fd = anon_inode_getfd("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); - if (fd < 0) + r = anon_inode_getfd("kvm-vm", &kvm_vm_fops, kvm, O_RDWR); + if (r < 0) kvm_put_kvm(kvm); - return fd; + return r; } static long kvm_dev_ioctl_check_extension_generic(long arg)