From: Stefan Weil <sw@weilnetz.de>
Date: Mon, 3 Sep 2012 20:40:40 +0000 (+0200)
Subject: kvm: Fix warning from static code analysis
X-Git-Tag: v1.2.1~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a78cedc09ebde304f3dbff70a15f507b7f5099e2;p=thirdparty%2Fqemu.git

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>
(cherry picked from commit 6d1cc3210ccc4372ffa337c187da9db68314c0c4)

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

diff --git a/kvm-all.c b/kvm-all.c
index e0244b6d1e3..afdeccba976 100644
--- 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);