[HW, TOOLS] return system_image_guid

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@1289 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/hw/mlx4/kernel/hca/data.c b/hw/mlx4/kernel/hca/data.c
index ae97df3..46e8d17 100644 (file)
--- a/hw/mlx4/kernel/hca/data.c
+++ b/hw/mlx4/kernel/hca/data.c
@@ -245,6 +245,7 @@ from_hca_cap(
        ca_attr_p->max_srq = hca_info_p->max_srq;\r
        ca_attr_p->max_srq_wrs = hca_info_p->max_srq_wr;\r
        ca_attr_p->max_srq_sges = hca_info_p->max_srq_sge;\r
+       ca_attr_p->system_image_guid = hca_info_p->sys_image_guid;\r
 \r
        ca_attr_p->local_ack_delay = hca_info_p->local_ca_ack_delay;\r
        ca_attr_p->bad_pkey_ctr_support = hca_info_p->device_cap_flags & IB_DEVICE_BAD_PKEY_CNTR;\r
@@ -255,6 +256,7 @@ from_hca_cap(
        ca_attr_p->change_primary_port  = hca_info_p->device_cap_flags & IB_DEVICE_CHANGE_PHY_PORT;\r
        ca_attr_p->modify_wr_depth      = hca_info_p->device_cap_flags & IB_DEVICE_RESIZE_MAX_WR;\r
        ca_attr_p->modify_srq_depth      = hca_info_p->device_cap_flags & IB_DEVICE_SRQ_RESIZE;\r
+       ca_attr_p->system_image_guid_support = hca_info_p->device_cap_flags & IB_DEVICE_SYS_IMAGE_GUID;\r
        ca_attr_p->hw_agents            = FALSE; // in the context of IBAL then agent is implemented on the host\r
 \r
        ca_attr_p->num_page_sizes = 1;\r

diff --git a/hw/mthca/kernel/hca_data.c b/hw/mthca/kernel/hca_data.c
index 4e0d528..aa98771 100644 (file)
--- a/hw/mthca/kernel/hca_data.c
+++ b/hw/mthca/kernel/hca_data.c
@@ -282,6 +282,7 @@ mlnx_conv_hca_cap(
        ca_attr_p->max_srq = hca_info_p->max_srq;\r
        ca_attr_p->max_srq_wrs = hca_info_p->max_srq_wr;\r
        ca_attr_p->max_srq_sges = hca_info_p->max_srq_sge;\r
+       ca_attr_p->system_image_guid = hca_info_p->sys_image_guid;\r
 \r
        ca_attr_p->local_ack_delay = hca_info_p->local_ca_ack_delay;\r
        ca_attr_p->bad_pkey_ctr_support = hca_info_p->device_cap_flags & IB_DEVICE_BAD_PKEY_CNTR;\r
@@ -292,6 +293,7 @@ mlnx_conv_hca_cap(
        ca_attr_p->change_primary_port  = hca_info_p->device_cap_flags & IB_DEVICE_CHANGE_PHY_PORT;\r
        ca_attr_p->modify_wr_depth      = hca_info_p->device_cap_flags & IB_DEVICE_RESIZE_MAX_WR;\r
        ca_attr_p->modify_srq_depth      = hca_info_p->device_cap_flags & IB_DEVICE_SRQ_RESIZE;\r
+       ca_attr_p->system_image_guid_support = hca_info_p->device_cap_flags & IB_DEVICE_SYS_IMAGE_GUID;\r
        ca_attr_p->hw_agents            = FALSE; // in the context of IBAL then agent is implemented on the host\r
 \r
        ca_attr_p->num_page_sizes = 1;\r

diff --git a/tools/vstat/user/vstat_main.c b/tools/vstat/user/vstat_main.c
index a901450..86acd26 100644 (file)
--- a/tools/vstat/user/vstat_main.c
+++ b/tools/vstat/user/vstat_main.c
@@ -82,8 +82,8 @@ void print64bit(ib_net64_t u64, BOOLEAN hexFormat){
        }\r
 }      \r
 \r
-void printGUID(ib_net64_t guid){\r
-       printf("\tnode_guid=");\r
+void printGUID(char *title, ib_net64_t guid){\r
+       printf(title);\r
        print64bit(guid, TRUE);\r
        printf("\n");\r
 }\r
@@ -340,8 +340,9 @@ void vstat_print_ca_attr(int idx,  ib_ca_attr_t* ca_attr, ib_port_info_t* vstat_
        }else{\r
                printf("\tfw_ver=0x%I64x\n",ca_attr->fw_ver);\r
        }\r
-       printGUID(ca_attr->ca_guid);\r
+       printGUID("\tnode_guid=", ca_attr->ca_guid);\r
        if(fullPrint){\r
+               printGUID("\tsys_image_guid=", ca_attr->system_image_guid);\r
                printf("\tnum_phys_ports = %d\n",ca_attr->num_ports);\r
                printf("\tmax_num_qp = 0x%x             (Maximum Number of QPs supported)\n", ca_attr->max_qps);\r
                printf("\tmax_qp_ous_wr = 0x%x          (Maximum Number of outstanding WR on any WQ)\n", ca_attr->max_wrs);\r