WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH 2 of 4] tools/blktap2/libvhd: move uuid wrapper funct

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH 2 of 4] tools/blktap2/libvhd: move uuid wrapper functions out of line
From: Ian Campbell <ian.campbell@xxxxxxxxxx>
Date: Tue, 15 Mar 2011 16:16:05 +0000
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
Delivery-date: Tue, 15 Mar 2011 09:19:28 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <patchbomb.1300205763@xxxxxxxxxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1300202108 0
# Node ID 75db4a775805fbdcb5013427661d94db1b7b17fc
# Parent  83a1d6598fa3617085baecec1cda1e4caa518c92
tools/blktap2/libvhd: move uuid wrapper functions out of line.

This isolates users of libvhd from the need to know about the
different OS schemes for UUIDs.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r 83a1d6598fa3 -r 75db4a775805 tools/blktap2/include/vhd-uuid.h
--- a/tools/blktap2/include/vhd-uuid.h  Tue Mar 15 15:12:50 2011 +0000
+++ b/tools/blktap2/include/vhd-uuid.h  Tue Mar 15 15:15:08 2011 +0000
@@ -25,101 +25,20 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #ifndef __BLKTAP2_VHD_UUID_H__
-#define __BLKTAP2_VHDUUID_H__
+#define __BLKTAP2_VHD_UUID_H__
 
 #if defined(__linux__)
 
 #include <uuid/uuid.h>
-
 typedef struct {
     uuid_t uuid;
 } vhd_uuid_t;
 
-static inline int vhd_uuid_is_nil(vhd_uuid_t *uuid)
-{
-       return uuid_is_null(uuid->uuid);
-}
-
-static inline void vhd_uuid_generate(vhd_uuid_t *uuid)
-{
-       uuid_generate(uuid->uuid);
-}
-
-static inline void vhd_uuid_to_string(vhd_uuid_t *uuid, char *out, size_t size)
-{
-       uuid_unparse(uuid->uuid, out);
-}
-
-static inline void vhd_uuid_from_string(vhd_uuid_t *uuid, const char *in)
-{
-       uuid_parse(in, uuid->uuid);
-}
-
-static inline void vhd_uuid_copy(vhd_uuid_t *dst, vhd_uuid_t *src)
-{
-       uuid_copy(dst->uuid, src->uuid);
-}
-
-static inline void vhd_uuid_clear(vhd_uuid_t *uuid)
-{
-       uuid_clear(uuid->uuid);
-}
-
-static inline int vhd_uuid_compare(vhd_uuid_t *uuid1, vhd_uuid_t *uuid2)
-{
-       return uuid_compare(uuid1->uuid, uuid2->uuid);
-}
-
 #elif defined(__NetBSD__)
 
 #include <uuid.h>
-#include <string.h>
-#include <stdlib.h>
 
 typedef uuid_t vhd_uuid_t;
-
-static inline int vhd_uuid_is_nil(vhd_uuid_t *uuid)
-{
-       uint32_t status;
-       return uuid_is_nil((uuid_t *)uuid, &status);
-}
-
-static inline void vhd_uuid_generate(vhd_uuid_t *uuid)
-{
-       uint32_t status;
-       uuid_create((uuid_t *)uuid, &status);
-}
-
-static inline void vhd_uuid_to_string(vhd_uuid_t *uuid, char *out, size_t size)
-{
-       uint32_t status;
-       char *_out = NULL;
-       uuid_to_string((uuid_t *)uuid, &_out, &status);
-       strlcpy(out, _out, size);
-       free(_out);
-}
-
-static inline void vhd_uuid_from_string(vhd_uuid_t *uuid, const char *in)
-{
-       uint32_t status;
-       uuid_from_string(in, (uuid_t *)uuid, &status);
-}
-
-static inline void vhd_uuid_copy(vhd_uuid_t *dst, vhd_uuid_t *src)
-{
-       memcpy((uuid_t *)dst, (uuid_t *)src, sizeof(uuid_t));
-}
-
-static inline void vhd_uuid_clear(vhd_uuid_t *uuid)
-{
-       memset((uuid_t *)uuid, 0, sizeof(uuid_t));
-}
-
-static inline int vhd_uuid_compare(vhd_uuid_t *uuid1, vhd_uuid_t *uuid2)
-{
-       uint32_t status;
-       return uuid_compare((uuid_t *)uuid1, (uuid_t *)uuid2, &status);
-}
 
 #else
 
@@ -127,4 +46,18 @@ static inline int vhd_uuid_compare(vhd_u
 
 #endif
 
+int vhd_uuid_is_nil(vhd_uuid_t *uuid);
+
+void vhd_uuid_generate(vhd_uuid_t *uuid);
+
+void vhd_uuid_to_string(vhd_uuid_t *uuid, char *out, size_t size);
+
+void vhd_uuid_from_string(vhd_uuid_t *uuid, const char *in);
+
+void vhd_uuid_copy(vhd_uuid_t *dst, vhd_uuid_t *src);
+
+void vhd_uuid_clear(vhd_uuid_t *uuid);
+
+int vhd_uuid_compare(vhd_uuid_t *uuid1, vhd_uuid_t *uuid2);
+
 #endif /* __BLKTAP2_VHD_UUID_H__ */
diff -r 83a1d6598fa3 -r 75db4a775805 tools/blktap2/vhd/lib/Makefile
--- a/tools/blktap2/vhd/lib/Makefile    Tue Mar 15 15:12:50 2011 +0000
+++ b/tools/blktap2/vhd/lib/Makefile    Tue Mar 15 15:15:08 2011 +0000
@@ -42,6 +42,7 @@ LIB-SRCS        += vhd-util-snapshot.c
 LIB-SRCS        += vhd-util-snapshot.c
 LIB-SRCS        += vhd-util-scan.c
 LIB-SRCS        += vhd-util-check.c
+LIB-SRCS        += vhd-util-uuid.c
 LIB-SRCS        += relative-path.c
 LIB-SRCS        += atomicio.c
 
diff -r 83a1d6598fa3 -r 75db4a775805 tools/blktap2/vhd/lib/vhd-util-uuid.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/blktap2/vhd/lib/vhd-util-uuid.c     Tue Mar 15 15:15:08 2011 +0000
@@ -0,0 +1,128 @@
+ /* Copyright (c) 2008, XenSource Inc.
+ * Copyright (c) 2011, Citrix
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of XenSource Inc. nor the names of its contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if defined(__linux__)
+
+#include <uuid/uuid.h>
+
+typedef struct {
+    uuid_t uuid;
+} vhd_uuid_t;
+
+int vhd_uuid_is_nil(vhd_uuid_t *uuid)
+{
+       return uuid_is_null(uuid->uuid);
+}
+
+void vhd_uuid_generate(vhd_uuid_t *uuid)
+{
+       uuid_generate(uuid->uuid);
+}
+
+void vhd_uuid_to_string(vhd_uuid_t *uuid, char *out, size_t size)
+{
+       uuid_unparse(uuid->uuid, out);
+}
+
+void vhd_uuid_from_string(vhd_uuid_t *uuid, const char *in)
+{
+       uuid_parse(in, uuid->uuid);
+}
+
+void vhd_uuid_copy(vhd_uuid_t *dst, vhd_uuid_t *src)
+{
+       uuid_copy(dst->uuid, src->uuid);
+}
+
+void vhd_uuid_clear(vhd_uuid_t *uuid)
+{
+       uuid_clear(uuid->uuid);
+}
+
+int vhd_uuid_compare(vhd_uuid_t *uuid1, vhd_uuid_t *uuid2)
+{
+       return uuid_compare(uuid1->uuid, uuid2->uuid);
+}
+
+#elif defined(__NetBSD__)
+
+#include <uuid.h>
+#include <string.h>
+#include <stdlib.h>
+
+typedef uuid_t vhd_uuid_t;
+
+int vhd_uuid_is_nil(vhd_uuid_t *uuid)
+{
+       uint32_t status;
+       return uuid_is_nil((uuid_t *)uuid, &status);
+}
+
+void vhd_uuid_generate(vhd_uuid_t *uuid)
+{
+       uint32_t status;
+       uuid_create((uuid_t *)uuid, &status);
+}
+
+void vhd_uuid_to_string(vhd_uuid_t *uuid, char *out, size_t size)
+{
+       uint32_t status;
+       char *_out = NULL;
+       uuid_to_string((uuid_t *)uuid, &_out, &status);
+       strlcpy(out, _out, size);
+       free(_out);
+}
+
+void vhd_uuid_from_string(vhd_uuid_t *uuid, const char *in)
+{
+       uint32_t status;
+       uuid_from_string(in, (uuid_t *)uuid, &status);
+}
+
+void vhd_uuid_copy(vhd_uuid_t *dst, vhd_uuid_t *src)
+{
+       memcpy((uuid_t *)dst, (uuid_t *)src, sizeof(uuid_t));
+}
+
+void vhd_uuid_clear(vhd_uuid_t *uuid)
+{
+       memset((uuid_t *)uuid, 0, sizeof(uuid_t));
+}
+
+int vhd_uuid_compare(vhd_uuid_t *uuid1, vhd_uuid_t *uuid2)
+{
+       uint32_t status;
+       return uuid_compare((uuid_t *)uuid1, (uuid_t *)uuid2, &status);
+}
+
+#else
+
+#error "Please update vhd-util-uuid.c for your OS"
+
+#endif

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel