vsock: optional prefix

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
moby · May 10, 2016 · c5898bf · c5898bf
1 parent f2ef226
commit c5898bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -82,6 +82,12 @@ HAVE_OCAML_QCOW := $(shell if ocamlfind query qcow uri >/dev/null 2>/dev/null ;
 ifeq ($(HAVE_OCAML_QCOW),YES)
 CFLAGS += -DHAVE_OCAML=1 -DHAVE_OCAML_QCOW=1 -DHAVE_OCAML=1
 
+# prefix vsock file names if PRI_ADDR_PREFIX
+# is defined. (not applied to aliases)
+ifneq ($(PRI_ADDR_PREFIX),)
+CFLAGS += -DPRI_ADDR_PREFIX=\"$(PRI_ADDR_PREFIX)\"
+endif
+
 OCAML_SRC := \
 	src/mirage_block_ocaml.ml
 

diff --git a/src/pci_virtio_sock.c b/src/pci_virtio_sock.c
@@ -136,7 +136,13 @@ struct vsock_addr {
 };
 #define PRIcid "08"PRIx32
 #define PRIport "08"PRIx32
-#define PRIaddr PRIcid ".%" PRIport
+
+#ifdef PRI_ADDR_PREFIX
+#define PRIaddr PRI_ADDR_PREFIX "%" PRIcid ".%" PRIport
+#else
+#define PRIaddr "%" PRIcid ".%" PRIport
+#endif
+
 #define FMTADDR(a) a.cid, a.port
 
 #define WRITE_BUF_LENGTH (128*1024)