diff options
| author | malc <av1474@comtv.ru> | 2011-11-02 02:16:34 +0400 |
|---|---|---|
| committer | malc <av1474@comtv.ru> | 2011-11-02 02:16:34 +0400 |
| commit | ef26ee0e6c67d415f8b22850f9f13a972ada8be1 (patch) | |
| tree | c18a9cc2a9f213c8a37473f9b7aa001a99898547 /kvm-all.c | |
| parent | dd7b25b5b47df8aaf5580faaf3f60b2a1b779c37 (diff) | |
| parent | e1c2008af64487e7d3cec615612b7f467ebe9bc8 (diff) | |
| download | focaccia-qemu-ef26ee0e6c67d415f8b22850f9f13a972ada8be1.tar.gz focaccia-qemu-ef26ee0e6c67d415f8b22850f9f13a972ada8be1.zip | |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'kvm-all.c')
| -rw-r--r-- | kvm-all.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kvm-all.c b/kvm-all.c index c09ddf7ac5..4c466d6aba 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -740,6 +740,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; } @@ -798,7 +799,7 @@ int kvm_init(void) err: if (s) { - if (s->vmfd != -1) { + if (s->vmfd >= 0) { close(s->vmfd); } if (s->fd != -1) { |