Version: 1
-Previous: 0967b745bc5cab42314ca8237125279d1b6646fe
-Head: 51df820f9bac89ee172f8b37d57255e1fc9ffba2
+Previous: 5c886b72af7cd9235a7c183083a91af2f9e04507
+Head: 9ed76bfdfaac559582ea1562cdd47135624afe88
Applied:
stder: 991c701f81cab5a1860ac7774f654edfef956068
pfx: 7f17ffc87301d39567af873e9aeb5e361bbcf2a7
- errmsg: 2f452fbc1edb04a7701fbc7596751f38478d1a90
- refresh-temp: 51df820f9bac89ee172f8b37d57255e1fc9ffba2
+ errmsg: 9ed76bfdfaac559582ea1562cdd47135624afe88
Unapplied:
sa_family: 85be179d2f63865dbf1f5adc1dc76c093c6b811e
af_ib: d6ca81dc1b7923005309b04c3bb684da0361cbc9
Bottom: 8ecca87db88331d6078a80c3fd9825bc2059cd28
-Top: 8ecca87db88331d6078a80c3fd9825bc2059cd28
+Top: 29515e2e36f97c36cfce9dc0aace196aae3e2879
Author: Yann Droneaud <ydroneaud@opteya.com>
Date: 2012-08-27 16:37:29 -0700
---
-
+diff --git a/src/cma.c b/src/cma.c
+index 7002513..4f6a5ab 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -158,15 +158,15 @@ static int check_abi_version(void)
+ * backports, assume the most recent version of the ABI. If
+ * we're wrong, we'll simply fail later when calling the ABI.
+ */
+- fprintf(stderr, PFX "couldn't read ABI version.\n");
+- fprintf(stderr, PFX "assuming: %d\n", abi_ver);
++ fprintf(stderr, PFX "Warning: couldn't read ABI version.\n");
++ fprintf(stderr, PFX "Warning: assuming: %d\n", abi_ver);
+ return 0;
+ }
+
+ abi_ver = strtol(value, NULL, 10);
+ if (abi_ver < RDMA_USER_CM_MIN_ABI_VERSION ||
+ abi_ver > RDMA_USER_CM_MAX_ABI_VERSION) {
+- fprintf(stderr, PFX "kernel ABI version %d "
++ fprintf(stderr, PFX "Fatal: kernel ABI version %d "
+ "doesn't match library version %d.\n",
+ abi_ver, RDMA_USER_CM_MAX_ABI_VERSION);
+ return -1;
+@@ -226,13 +226,13 @@ int ucma_init(void)
+
+ dev_list = ibv_get_device_list(&dev_cnt);
+ if (!dev_list) {
+- fprintf(stderr, PFX "unable to get RDMA device list\n");
++ fprintf(stderr, PFX "Fatal: unable to get RDMA device list\n");
+ ret = ERR(ENODEV);
+ goto err1;
+ }
+
+ if (!dev_cnt) {
+- fprintf(stderr, PFX "no RDMA devices found\n");
++ fprintf(stderr, PFX "Fatal: no RDMA devices found\n");
+ ret = ERR(ENODEV);
+ goto err2;
+ }
+@@ -249,7 +249,7 @@ int ucma_init(void)
+ cma_dev->guid = ibv_get_device_guid(dev_list[i]);
+ cma_dev->verbs = ibv_open_device(dev_list[i]);
+ if (!cma_dev->verbs) {
+- fprintf(stderr, PFX "unable to open RDMA device\n");
++ fprintf(stderr, PFX "Fatal: unable to open RDMA device\n");
+ ret = ERR(ENODEV);
+ goto err3;
+ }
+@@ -257,7 +257,7 @@ int ucma_init(void)
+ i++;
+ ret = ibv_query_device(cma_dev->verbs, &attr);
+ if (ret) {
+- fprintf(stderr, PFX "unable to query RDMA device\n");
++ fprintf(stderr, PFX "Fatal: unable to query RDMA device\n");
+ ret = ERR(ret);
+ goto err3;
+ }
+@@ -329,7 +329,7 @@ struct rdma_event_channel *rdma_create_event_channel(void)
+
+ channel->fd = open("/dev/infiniband/rdma_cm", O_RDWR);
+ if (channel->fd < 0) {
+- fprintf(stderr, PFX "unable to open /dev/infiniband/rdma_cm\n");
++ fprintf(stderr, PFX "Fatal: unable to open /dev/infiniband/rdma_cm\n");
+ goto err;
+ }
+ return channel;
+++ /dev/null
-Bottom: 8ecca87db88331d6078a80c3fd9825bc2059cd28
-Top: 29515e2e36f97c36cfce9dc0aace196aae3e2879
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-08-27 16:37:50 -0700
-
-Refresh of errmsg
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index 7002513..4f6a5ab 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -158,15 +158,15 @@ static int check_abi_version(void)
- * backports, assume the most recent version of the ABI. If
- * we're wrong, we'll simply fail later when calling the ABI.
- */
-- fprintf(stderr, PFX "couldn't read ABI version.\n");
-- fprintf(stderr, PFX "assuming: %d\n", abi_ver);
-+ fprintf(stderr, PFX "Warning: couldn't read ABI version.\n");
-+ fprintf(stderr, PFX "Warning: assuming: %d\n", abi_ver);
- return 0;
- }
-
- abi_ver = strtol(value, NULL, 10);
- if (abi_ver < RDMA_USER_CM_MIN_ABI_VERSION ||
- abi_ver > RDMA_USER_CM_MAX_ABI_VERSION) {
-- fprintf(stderr, PFX "kernel ABI version %d "
-+ fprintf(stderr, PFX "Fatal: kernel ABI version %d "
- "doesn't match library version %d.\n",
- abi_ver, RDMA_USER_CM_MAX_ABI_VERSION);
- return -1;
-@@ -226,13 +226,13 @@ int ucma_init(void)
-
- dev_list = ibv_get_device_list(&dev_cnt);
- if (!dev_list) {
-- fprintf(stderr, PFX "unable to get RDMA device list\n");
-+ fprintf(stderr, PFX "Fatal: unable to get RDMA device list\n");
- ret = ERR(ENODEV);
- goto err1;
- }
-
- if (!dev_cnt) {
-- fprintf(stderr, PFX "no RDMA devices found\n");
-+ fprintf(stderr, PFX "Fatal: no RDMA devices found\n");
- ret = ERR(ENODEV);
- goto err2;
- }
-@@ -249,7 +249,7 @@ int ucma_init(void)
- cma_dev->guid = ibv_get_device_guid(dev_list[i]);
- cma_dev->verbs = ibv_open_device(dev_list[i]);
- if (!cma_dev->verbs) {
-- fprintf(stderr, PFX "unable to open RDMA device\n");
-+ fprintf(stderr, PFX "Fatal: unable to open RDMA device\n");
- ret = ERR(ENODEV);
- goto err3;
- }
-@@ -257,7 +257,7 @@ int ucma_init(void)
- i++;
- ret = ibv_query_device(cma_dev->verbs, &attr);
- if (ret) {
-- fprintf(stderr, PFX "unable to query RDMA device\n");
-+ fprintf(stderr, PFX "Fatal: unable to query RDMA device\n");
- ret = ERR(ret);
- goto err3;
- }
-@@ -329,7 +329,7 @@ struct rdma_event_channel *rdma_create_event_channel(void)
-
- channel->fd = open("/dev/infiniband/rdma_cm", O_RDWR);
- if (channel->fd < 0) {
-- fprintf(stderr, PFX "unable to open /dev/infiniband/rdma_cm\n");
-+ fprintf(stderr, PFX "Fatal: unable to open /dev/infiniband/rdma_cm\n");
- goto err;
- }
- return channel;