Merge pull request #51 from fbarrat/master

Fix test build + prepare release 1.2.1
OpenCAPI · Jun 16, 2021 · ca8679d · ca8679d
2 parents 97a12b3 + 78d0d5b
commit ca8679d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,16 @@
+# 1.2.1
+ - Set library version correctly
+ - Fix test build
+
+# 1.2.0
+This is mostly a bug fix release, there's no major new feature:
+ - Fix to support devices names with a hexadecimal domain name
+ - Allow to override path to read driver info (LIBOCXL_SYSPATH)
+ - Documentation enhancements
+ - Makefile/build enhancements
+ - Add tests for debug AFUs (memcpy, afp)
+
+
 # 1.1.0
 ## User facing changes
  - Requires Linux headers >= 4.18 to compile

diff --git a/Makefile.vars b/Makefile.vars
@@ -6,10 +6,10 @@ MAKEFLAGS += -rR
 VERSION_MAJOR = 1
 
 # Change VERSION_MINOR on new features
-VERSION_MINOR = 1
+VERSION_MINOR = 2
 
 # Change VERSION_PATCH on each tag
-VERSION_PATCH = 0
+VERSION_PATCH = 1
 
 AR  = $(CROSS_COMPILE)ar
 AS	= $(CROSS_COMPILE)as

diff --git a/unittests/unittests.c b/unittests/unittests.c
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "libocxl_internal.h"
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
@@ -24,14 +25,9 @@
 #include <pthread.h>
 #include <signal.h>
 #include <fcntl.h>
-
 #include <misc/ocxl.h>
-
-#include "libocxl_internal.h"
 #include "static.h"
 
-#include <stdlib.h>
-
 static const char *ocxl_sysfs_path = "/tmp/ocxl-test";
 static const char *ocxl_dev_path = "/dev/ocxl-test";
 

diff --git a/unittests/virtocxl.c b/unittests/virtocxl.c
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
+#include "libocxl_internal.h"
 #include <fuse/cuse_lowlevel.h>
 #include <fuse/fuse_lowlevel.h>
 #include <linux/poll.h>
-#include "libocxl_internal.h"
 #include <misc/ocxl.h>
 #include <errno.h>
 #include <sys/types.h>
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <pthread.h>
-
 #include <stdlib.h>
 
 typedef struct ocxl_kernel_event_header ocxl_kernel_event_header;
@@ -193,7 +192,7 @@ bool afu_is_attached() {
  * @return the thread for the device, or 0 on error
  */
 pthread_t create_ocxl_device(const char *afu_name, size_t global_mmio_size, size_t per_pasid_mmio_size) {
-	char sysfs_base[PATH_MAX];
+	char sysfs_base[PATH_MAX - 20];
 	char tmp[PATH_MAX];
 	char buf[BUF_SIZE];