From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJFXh-0005ji-Rl for qemu-devel@nongnu.org; Wed, 26 Oct 2011 22:18:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJFXg-00081v-MI for qemu-devel@nongnu.org; Wed, 26 Oct 2011 22:18:05 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:39789) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJFXg-00081p-52 for qemu-devel@nongnu.org; Wed, 26 Oct 2011 22:18:04 -0400 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [202.81.31.245]) by e23smtp01.au.ibm.com (8.14.4/8.13.1) with ESMTP id p9R2GBJF030383 for ; Thu, 27 Oct 2011 13:16:11 +1100 Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9R2GbRL2052332 for ; Thu, 27 Oct 2011 13:16:39 +1100 Received: from d23av01.au.ibm.com (loopback [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9R2GaYK031430 for ; Thu, 27 Oct 2011 13:16:36 +1100 From: Xu He Jie Date: Thu, 27 Oct 2011 10:15:13 +0800 Message-Id: <1319681713-17168-1-git-send-email-xuhj@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2] kvm_init didn't set return value after create vm failed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Xu He Jie , mtosatti@redhat.com, avi@redhat.com kvm_init didn't set return value after create vm failed. And kvm_ioctl(s, KVM_CREATE_VM, 0)'s return value can be < -1, so change the check of vmfd at label 'err'. Signed-off-by: Xu He Jie --- kvm-all.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index e7faf5c..70edb39 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -739,6 +739,7 @@ int kvm_init(void) fprintf(stderr, "Please add the 'switch_amode' kernel parameter to " "your host kernel command line\n"); #endif + ret = s->vmfd; goto err; } @@ -797,7 +798,7 @@ int kvm_init(void) err: if (s) { - if (s->vmfd != -1) { + if (s->vmfd >= 0) { close(s->vmfd); } if (s->fd != -1) { -- 1.7.5.4