Merge pull request #6040 from hppritcha/topic/swat_issue5810_v2.x

jsquyres · web-flow · commit c049a32ec8f5 · 2018-11-07T10:08:16.000-05: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
@@ -1642,6 +1642,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
`@@ -1642,6 +1642,7 @@ static int init_one_device(opal_list_t btl_list, struct ibv_device ib_dev)`
`1642`	`1642`	`goto error;`
`1643`	`1643`	`}`
`1644`	`1644`	`#if HAVE_DECL_IBV_EXP_QUERY_DEVICE`
	`1645`	`+ memset(&device->ib_exp_dev_attr, 0, sizeof(device->ib_exp_dev_attr));`
`1645`	`1646`	`device->ib_exp_dev_attr.comp_mask = IBV_EXP_DEVICE_ATTR_RESERVED - 1;`
`1646`	`1647`	`if(ibv_exp_query_device(device->ib_dev_context, &device->ib_exp_dev_attr)){`
`1647`	`1648`	`BTL_ERROR(("error obtaining device attributes for %s errno says %s",`