* [Qemu-devel] [PATCH v2] kvm_init didn't set return value after create vm failed
@ 2011-10-27 2:15 Xu He Jie
0 siblings, 0 replies; only message in thread
From: Xu He Jie @ 2011-10-27 2:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Xu He Jie, mtosatti, avi
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 <xuhj@linux.vnet.ibm.com>
---
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-10-27 2:18 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-27 2:15 [Qemu-devel] [PATCH v2] kvm_init didn't set return value after create vm failed Xu He Jie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).