From: Michael Brown <mcb30@etherboot.org>
Date: Mon, 16 Nov 2009 20:34:54 +0000 (+0000)
Subject: [infiniband] Include hostname in node description, if available
X-Git-Tag: v1.0.0-rc1~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=228ac9d0184006d22f12d5daecd0a03d81cd029e;p=thirdparty%2Fipxe.git

[infiniband] Include hostname in node description, if available
---

diff --git a/src/net/infiniband/ib_sma.c b/src/net/infiniband/ib_sma.c
index 562b0925a..ff4cbbf6a 100644
--- a/src/net/infiniband/ib_sma.c
+++ b/src/net/infiniband/ib_sma.c
@@ -25,6 +25,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <stdio.h>
 #include <unistd.h>
 #include <byteswap.h>
+#include <gpxe/settings.h>
 #include <gpxe/infiniband.h>
 #include <gpxe/iobuf.h>
 #include <gpxe/ib_mi.h>
@@ -88,13 +89,18 @@ static void ib_sma_node_desc ( struct ib_device *ibdev,
 			       struct ib_address_vector *av ) {
 	struct ib_node_desc *node_desc = &mad->smp.smp_data.node_desc;
 	struct ib_gid_half guid;
+	char hostname[ sizeof ( node_desc->node_string ) ];
+	int hostname_len;
 	int rc;
 
 	/* Fill in information */
 	memset ( node_desc, 0, sizeof ( *node_desc ) );
 	ib_get_hca_info ( ibdev, &guid );
+	hostname_len = fetch_string_setting ( NULL, &hostname_setting,
+					      hostname, sizeof ( hostname ) );
 	snprintf ( node_desc->node_string, sizeof ( node_desc->node_string ),
-		   "gPXE %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x (%s)",
+		   "gPXE %s%s%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x (%s)",
+		   hostname, ( ( hostname_len >= 0 ) ? " " : "" ),
 		   guid.u.bytes[0], guid.u.bytes[1], guid.u.bytes[2],
 		   guid.u.bytes[3], guid.u.bytes[4], guid.u.bytes[5],
 		   guid.u.bytes[6], guid.u.bytes[7], ibdev->dev->name );