From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 9 Mar 2010 13:54:01 +0000 (+0100)
Subject: Wipe nodeinfo structure before filling it
X-Git-Tag: v0.8.0~325
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22e39d0ee445173610bab6fbead676abd528627b;p=thirdparty%2Flibvirt.git

Wipe nodeinfo structure before filling it

The nodeinfo structure wasn't initialized in qemu driver and with the
recent change in CPU topology parsing, old value of nodeinfo->sockets
could be used and incremented giving totally bogus results.

Let's just wipe the structure completely.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 2dab5b29c8..1ee37096a8 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -251,18 +251,17 @@ int linuxNodeInfoCPUPopulate(virConnectPtr conn, FILE *cpuinfo,
 
 int nodeGetInfo(virConnectPtr conn,
                 virNodeInfoPtr nodeinfo) {
+    memset(nodeinfo, 0, sizeof(*nodeinfo));
+
 #ifdef HAVE_UNAME
+    {
     struct utsname info;
 
     uname(&info);
 
     if (virStrcpyStatic(nodeinfo->model, info.machine) == NULL)
         return -1;
-
-#else /* !HAVE_UNAME */
-
-    nodeinfo->model[0] = '\0';
-
+    }
 #endif /* !HAVE_UNAME */
 
 #ifdef __linux__