blktap2: Further netbsd build fixes.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

4 files changed, 76 insertions, 24 deletions

diff --git a/tools/blktap2/include/uuid.h b/tools/blktap2/include/blk_uuid.h
index e80832474c..82922619e0 100644
--- a/tools/blktap2/include/uuid.h
+++ b/tools/blktap2/include/blk_uuid.h
@@ -31,42 +31,95 @@
 
 #include <uuid/uuid.h>
 
-#else
+typedef struct {
+    uuid_t uuid;
+} blk_uuid_t;
+
+static inline int blk_uuid_is_nil(blk_uuid_t *uuid)
+{
+	return uuid_is_null(uuid->uuid);
+}
+
+static inline void blk_uuid_generate(blk_uuid_t *uuid)
+{
+	uuid_generate(uuid->uuid);
+}
+
+static inline void blk_uuid_to_string(blk_uuid_t *uuid, char *out)
+{
+	uuid_unparse(uuid->uuid, out);
+}
+
+static inline void blk_uuid_from_string(blk_uuid_t *uuid, const char *in)
+{
+	uuid_parse(in, uuid->uuid);
+}
+
+static inline void blk_uuid_copy(blk_uuid_t *dst, blk_uuid_t *src)
+{
+	uuid_copy(dst->uuid, src->uuid);
+}
+
+static inline void blk_uuid_clear(blk_uuid_t *uuid)
+{
+	uuid_clear(uuid->uuid);
+}
+
+static inline int blk_uuid_compare(blk_uuid_t *uuid1, blk_uuid_t *uuid2)
+{
+	return uuid_compare(uuid1->uuid, uuid2->uuid);
+}
+
+#elif defined(__NetBSD__)
 
-#include <inttypes.h>
-#include <string.h>
 #include <uuid.h>
+#include <string.h>
+
+typedef uuid_t blk_uuid_t;
 
-static inline int uuid_is_null(uuid_t uuid)
+static inline int blk_uuid_is_nil(blk_uuid_t *uuid)
 {
-    uint32_t status;
-    return uuid_is_nil(&uuid, &status);
+	uint32_t status;
+	return uuid_is_nil((uuid_t *)uuid, &status);
 }
 
-static inline void uuid_generate(uuid_t uuid)
+static inline void blk_uuid_generate(blk_uuid_t *uuid)
 {
-    uint32_t status;
-    uuid_create(&uuid, &status);
+	uint32_t status;
+	uuid_create((uuid_t *)uuid, &status);
 }
 
-static inline void uuid_unparse(uuid_t uuid, char *out)
+static inline void blk_uuid_to_string(blk_uuid_t *uuid, char *out)
 {
-    uint32_t status;
-    uuid_to_string(&uuid, (char **)&out, &status);
+	uint32_t status;
+	uuid_to_string((uuid_t *)uuid, &out, &status);
 }
 
-static inline void uuid_copy(uuid_t dst, uuid_t src)
+static inline void blk_uuid_from_string(blk_uuid_t *uuid, const char *in)
 {
-    memcpy(dst, src, sizeof(dst));
+	uint32_t status;
+	uuid_from_string(in, (uuid_t *)uuid, &status);
 }
 
-static inline void uuid_clear(uuid_t uu)
+static inline void blk_uuid_copy(blk_uuid_t *dst, blk_uuid_t *src)
 {
-    memset(uu, 0, sizeof(uu));
+	memcpy((uuid_t *)dst, (uuid_t *)src, sizeof(uuid_t));
 }
 
-#define uuid_compare(x,y) \
-    ({ uint32_t status; uuid_compare(&(x),&(y),&status); })
+static inline void blk_uuid_clear(blk_uuid_t *uuid)
+{
+	memset((uuid_t *)uuid, 0, sizeof(uuid_t));
+}
+
+static inline int blk_uuid_compare(blk_uuid_t *uuid1, blk_uuid_t *uuid2)
+{
+	uint32_t status;
+	return uuid_compare((uuid_t *)uuid1, (uuid_t *)uuid2, &status);
+}
+
+#else
+
+#error "Please update blk_uuid.h for your OS"
 
 #endif
 
diff --git a/tools/blktap2/include/libvhd-journal.h b/tools/blktap2/include/libvhd-journal.h
index 2f32ff02ca..75852523c9 100644
--- a/tools/blktap2/include/libvhd-journal.h
+++ b/tools/blktap2/include/libvhd-journal.h
@@ -39,7 +39,7 @@
 
 typedef struct vhd_journal_header {
 	char                       cookie[8];
-	uuid_t                     uuid;
+	blk_uuid_t                 uuid;
 	uint64_t                   vhd_footer_offset;
 	uint32_t                   journal_data_entries;
 	uint32_t                   journal_metadata_entries;
diff --git a/tools/blktap2/include/libvhd.h b/tools/blktap2/include/libvhd.h
index 6d5979b1d7..71082ad843 100644
--- a/tools/blktap2/include/libvhd.h
+++ b/tools/blktap2/include/libvhd.h
@@ -36,7 +36,7 @@
 #include <sys/bswap.h>
 #endif
 
-#include "uuid.h"
+#include "blk_uuid.h"
 #include "vhd.h"
 
 #ifndef O_LARGEFILE
@@ -216,7 +216,7 @@ vhd_parent_locator_size(vhd_parent_locator_t *loc)
 static inline int
 vhd_parent_raw(vhd_context_t *ctx)
 {
-	return uuid_is_null(ctx->header.prt_uuid);
+	return blk_uuid_is_nil(&ctx->header.prt_uuid);
 }
 
 void libvhd_set_log_level(int);
diff --git a/tools/blktap2/include/vhd.h b/tools/blktap2/include/vhd.h
index 25b8b29e01..a31aadf491 100644
--- a/tools/blktap2/include/vhd.h
+++ b/tools/blktap2/include/vhd.h
@@ -28,7 +28,6 @@
 #define __VHD_H__
 
 #include <inttypes.h>
-#include "uuid.h"
 
 typedef uint32_t u32;
 typedef uint64_t u64;
@@ -60,7 +59,7 @@ struct hd_ftr {
   u32    geometry;        /* Disk geometry                                */
   u32    type;            /* Disk type                                    */
   u32    checksum;        /* 1's comp sum of this struct.                 */
-  uuid_t uuid;            /* Unique disk ID, used for naming parents      */
+  blk_uuid_t uuid;        /* Unique disk ID, used for naming parents      */
   char   saved;           /* one-bit -- is this disk/VM in a saved state? */
   char   hidden;          /* tapdisk-specific field: is this vdi hidden?  */
   char   reserved[426];   /* padding                                      */
@@ -148,7 +147,7 @@ struct dd_hdr {
   u32    max_bat_size;    /* Maximum number of entries in the BAT         */
   u32    block_size;      /* Block size in bytes. Must be power of 2.     */
   u32    checksum;        /* Header checksum.  1's comp of all fields.    */
-  uuid_t prt_uuid;        /* ID of the parent disk.                       */
+  blk_uuid_t prt_uuid;    /* ID of the parent disk.                       */
   u32    prt_ts;          /* Modification time of the parent disk         */
   u32    res1;            /* Reserved.                                    */
   char   prt_name[512];   /* Parent unicode name.                         */