Merge pull request #6039 from hppritcha/topic/swat_issue5810_v3.0.x

hppritcha · web-flow · commit 62a424077ced · 2018-11-09T11:54:05.000-07:00
btl/openib: fix a problem with ib query
diff --git a/opal/mca/btl/openib/btl_openib_component.c b/opal/mca/btl/openib/btl_openib_component.c
@@ -1664,6 +1664,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
         goto error;
     }
 #if HAVE_DECL_IBV_EXP_QUERY_DEVICE
+    memset(&device->ib_exp_dev_attr, 0, sizeof(device->ib_exp_dev_attr));
     device->ib_exp_dev_attr.comp_mask = IBV_EXP_DEVICE_ATTR_RESERVED - 1;
     if(ibv_exp_query_device(device->ib_dev_context, &device->ib_exp_dev_attr)){
         BTL_ERROR(("error obtaining device attributes for %s errno says %s",

Original file line number	Diff line number	Diff line change
`@@ -1664,6 +1664,7 @@ static int init_one_device(opal_list_t btl_list, struct ibv_device ib_dev)`
`1664`	`1664`	`goto error;`
`1665`	`1665`	`}`
`1666`	`1666`	`#if HAVE_DECL_IBV_EXP_QUERY_DEVICE`
	`1667`	`+ memset(&device->ib_exp_dev_attr, 0, sizeof(device->ib_exp_dev_attr));`
`1667`	`1668`	`device->ib_exp_dev_attr.comp_mask = IBV_EXP_DEVICE_ATTR_RESERVED - 1;`
`1668`	`1669`	`if(ibv_exp_query_device(device->ib_dev_context, &device->ib_exp_dev_attr)){`
`1669`	`1670`	`BTL_ERROR(("error obtaining device attributes for %s errno says %s",`