summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2012-09-03 22:40:40 +0200
committerStefan Hajnoczi <stefanha@gmail.com>2012-09-14 08:21:29 +0100
commit6d1cc3210ccc4372ffa337c187da9db68314c0c4 (patch)
tree6956f1b9704ded9ccb32dc9fabcae6e6860c0d62
parent6932a69b20a88428c531805cdd20eec8acf05b27 (diff)
downloadfocaccia-qemu-6d1cc3210ccc4372ffa337c187da9db68314c0c4.tar.gz
focaccia-qemu-6d1cc3210ccc4372ffa337c187da9db68314c0c4.zip
kvm: Fix warning from static code analysis
Report from smatch:

kvm-all.c:1373 kvm_init(135) warn:
 variable dereferenced before check 's' (see line 1360)

's' cannot by NULL (it was alloced using g_malloc0), so there is no need
to check it here.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
-rw-r--r--kvm-all.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/kvm-all.c b/kvm-all.c
index 39cff55f5b..e5ed3df1ac 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1409,13 +1409,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);