]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
kvm: Fix warning from static code analysis
authorStefan Weil <sw@weilnetz.de>
Mon, 3 Sep 2012 20:40:40 +0000 (22:40 +0200)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Fri, 12 Oct 2012 02:44:17 +0000 (21:44 -0500)
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>
(cherry picked from commit 6d1cc3210ccc4372ffa337c187da9db68314c0c4)

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
kvm-all.c

index e0244b6d1e3e512a56fab275b536a9b018cf5d5a..afdeccba976d28657f09bcef79accf64323ecc8f 100644 (file)
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1374,13 +1374,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);