From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 10 Dec 2012 21:58:16 +0000 (+0000)
Subject: Convert nodeGetInfo to virArch APIs
X-Git-Tag: v1.0.2-rc1~378
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a217e84c4a0754dc023c95de0410fe409646605;p=thirdparty%2Flibvirt.git

Convert nodeGetInfo to virArch APIs

Replace use of uname in nodeGetInfo with virArch APIs to
provide canonicalization of host architecture name

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 096000ba13..89322a4710 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -47,6 +47,7 @@
 #include "virterror_internal.h"
 #include "count-one-bits.h"
 #include "intprops.h"
+#include "virarch.h"
 #include "virfile.h"
 #include "virtypedparam.h"
 
@@ -841,13 +842,11 @@ error:
 }
 #endif
 
-int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo) {
-    struct utsname info;
-
-    memset(nodeinfo, 0, sizeof(*nodeinfo));
-    uname(&info);
+int nodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, virNodeInfoPtr nodeinfo)
+{
+    virArch hostarch = virArchFromHost();
 
-    if (virStrcpyStatic(nodeinfo->model, info.machine) == NULL)
+    if (virStrcpyStatic(nodeinfo->model, virArchToString(hostarch)) == NULL)
         return -1;
 
 #ifdef __linux__