aboutsummaryrefslogtreecommitdiff
path: root/kvm-all.c
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-09-17 10:21:42 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-09-17 10:21:42 -0500
commit509e9c462d03c4b7edc4a0d277311a7f45c9c046 (patch)
treef081154c44f3836f25502d654ade6e011ea7125e /kvm-all.c
parentcd6dcc710541dd39504f47a5c258f14a762bb767 (diff)
parente84d5956cc6215d2f098e7b6090fc5ec4cba1be3 (diff)
downloadqemu-509e9c462d03c4b7edc4a0d277311a7f45c9c046.zip
qemu-509e9c462d03c4b7edc4a0d277311a7f45c9c046.tar.gz
qemu-509e9c462d03c4b7edc4a0d277311a7f45c9c046.tar.bz2
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: configure: fix seccomp check arch_init.c: add missing '%' symbols before PRIu64 in debug printfs kvm: Fix warning from static code analysis qapi: Fix enumeration typo error console: Clean up bytes per pixel calculation Fix copy&paste typos in documentation comments linux-user: Remove #if 0'd cpu_get_real_ticks() definition ui: Fix spelling in comment (ressource -> resource) Spelling fixes in comments and macro names (ressource -> resource) Fix spelling (licenced -> licensed) in GPL Spelling fixes in comments and documentation srp: Don't use QEMU_PACKED for single elements of a structured type
Diffstat (limited to 'kvm-all.c')
-rw-r--r--kvm-all.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/kvm-all.c b/kvm-all.c
index b69537a..92a7137 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1410,13 +1410,11 @@ int kvm_init(void)
return 0;
err:
- if (s) {
- if (s->vmfd >= 0) {
- close(s->vmfd);
- }
- if (s->fd != -1) {
- close(s->fd);
- }
+ if (s->vmfd >= 0) {
+ close(s->vmfd);
+ }
+ if (s->fd != -1) {
+ close(s->fd);
}
g_free(s);