Skip to contentSkip to conversation

: xl: randomly generate UUID's

PATCH Superseded Gianni Tedesco 3 participants 9 messages Aug 20, 2010 – Aug 27, 2010

v3 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 : xl: randomly generate UUID's

Changes since last time:
- Re-based to remove orthogonal concern of UUID string formatting fixed in 22001:0b6f82eaaea9 "xl: make libxl_uuid2string internal to libxenlight"
- Incorporated Christoph Egger's suggestions

8<--------------------------------------------------------------- This patch converts xl to randomly generate UUID's rather than using a dodgy time-seeded PRNG. I have ignored various suggestions so far on auto-generation of MAC addresses and left it as a topic for a future patch to solve. In other words the behaviour stays the same it's just using a true random source.

tools/libxl/Makefile +3 -0
diff -r 56e9e0b9b624 tools/libxl/Makefile
@@ -16,6 +16,9 @@ CFLAGS += -I. -fPIC
 CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl)
 
 LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(UTIL_LIBS)
+ifeq ($(CONFIG_Linux),y)
+LIBS += -luuid
+endif
 
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o
 ifeq ($(LIBXL_BLKTAP),y)
tools/libxl/libxl.c +3 -3
diff -r 56e9e0b9b624 tools/libxl/libxl.c
@@ -127,7 +127,7 @@ int libxl_domain_make(libxl_ctx *ctx, li
     *domid = -1;
 
     /* Ultimately, handle is an array of 16 uint8_t, same as uuid */
-    memcpy(handle, info->uuid, sizeof(xen_domain_handle_t));
+    libxl_uuid_copy((libxl_uuid *)handle, &info->uuid);
 
     ret = xc_domain_create(ctx->xch, info->ssidref, handle, flags, domid);
     if (ret < 0) {
@@ -1502,8 +1502,8 @@ static int libxl_create_stubdom(libxl_ct
     memset(&c_info, 0x00, sizeof(libxl_domain_create_info));
     c_info.hvm = 0;
     c_info.name = libxl_sprintf(&gc, "%s-dm", _libxl_domid_to_name(&gc, info->domid));
-    for (i = 0; i < 16; i++)
-        c_info.uuid[i] = info->uuid[i];
+
+    libxl_uuid_copy(&c_info.uuid, &info->uuid);
 
     memset(&b_info, 0x00, sizeof(libxl_domain_build_info));
     b_info.max_vcpus = 1;
tools/libxl/libxl.h +1 -7
diff -r 56e9e0b9b624 tools/libxl/libxl.h
@@ -131,13 +131,7 @@
 #include <xs.h>
 #include <sys/wait.h> /* for pid_t */
 
-typedef uint8_t libxl_uuid[16];
-#define LIBXL_UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
-#define LIBXL_UUID_BYTES(uuid) uuid[0], uuid[1], uuid[2], uuid[3], \
-            uuid[4], uuid[5], uuid[6], uuid[7], \
-            uuid[8], uuid[9], uuid[10], uuid[11], \
-            uuid[12], uuid[13], uuid[14], uuid[15] \
-
+#include "libxl_uuid.h"
 
 typedef uint8_t libxl_mac[6];
 
tools/libxl/libxl_uuid.h new file +151 -0

151 lines not on this page · raw message

tools/libxl/xl.c +0 -2
diff -r 56e9e0b9b624 tools/libxl/xl.c
@@ -69,8 +69,6 @@ int main(int argc, char **argv)
         exit(1);
     }
 
-    srand(time(0));
-
     cspec = cmdtable_lookup(cmd);
     if (cspec)
         ret = cspec->cmd_impl(argc, argv);
tools/libxl/xl_cmdimpl.c +22 -19

91 lines not on this page · raw message

#1 lore raw
Quoted 4 lines · On Friday 20 August 2010 17:15:21 Gianni Tedesco wrote:

Changes since last time:
- Re-based to remove orthogonal concern of UUID string formatting fixed in 22001:0b6f82eaaea9 "xl: make libxl_uuid2string internal to
libxenlight" - Incorporated Christoph Egger's suggestions

I will give this patch a try next week.
Christoph

Quoted 342 lines

8<--------------------------------------------------------------- This patch converts xl to randomly generate UUID's rather than using a dodgy time-seeded PRNG. I have ignored various suggestions so far on auto-generation of MAC addresses and left it as a topic for a future patch to solve. In other words the behaviour stays the same it's just using a true random source.

diff -r 56e9e0b9b624 tools/libxl/Makefile

tools/libxl/Makefile Fri Aug 20 16:14:11 2010 +0100 renamed from tools/libxl/Makefile Fri Aug 20 16:03:28 2010 +0100 +2 -0
@@ -16,6 +16,9 @@ CFLAGS += -I. -fPIC
 CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore)
 $(CFLAGS_libblktapctl)
 
 LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore)
 $(LDLIBS_libblktapctl) $(UTIL_LIBS) +ifeq ($(CONFIG_Linux),y)
+LIBS += -luuid
+endif
 
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o
 ifeq ($(LIBXL_BLKTAP),y)

diff -r 56e9e0b9b624 tools/libxl/libxl.c

tools/libxl/libxl.c Fri Aug 20 16:14:11 2010 +0100 renamed from tools/libxl/libxl.c Fri Aug 20 16:03:28 2010 +0100 +3 -2
@@ -127,7 +127,7 @@ int libxl_domain_make(libxl_ctx *ctx, li
     *domid = -1;
 
     /* Ultimately, handle is an array of 16 uint8_t, same as uuid */
-    memcpy(handle, info->uuid, sizeof(xen_domain_handle_t));
+    libxl_uuid_copy((libxl_uuid *)handle, &info->uuid);
 
     ret = xc_domain_create(ctx->xch, info->ssidref, handle, flags, domid);
     if (ret < 0) {
@@ -1502,8 +1502,8 @@ static int libxl_create_stubdom(libxl_ct
     memset(&c_info, 0x00, sizeof(libxl_domain_create_info));
     c_info.hvm = 0;
     c_info.name = libxl_sprintf(&gc, "%s-dm", _libxl_domid_to_name(&gc,
 info->domid)); -    for (i = 0; i < 16; i++)
-        c_info.uuid[i] = info->uuid[i];
+
+    libxl_uuid_copy(&c_info.uuid, &info->uuid);
 
     memset(&b_info, 0x00, sizeof(libxl_domain_build_info));
     b_info.max_vcpus = 1;

diff -r 56e9e0b9b624 tools/libxl/libxl.h

tools/libxl/libxl.h Fri Aug 20 16:14:11 2010 +0100 renamed from tools/libxl/libxl.h Fri Aug 20 16:03:28 2010 +0100 +0 -2
@@ -131,13 +131,7 @@
 #include <xs.h>
 #include <sys/wait.h> /* for pid_t */
 
-typedef uint8_t libxl_uuid[16];
-#define LIBXL_UUID_FMT

"%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02h hx%02hhx%02hhx%02hhx%02hhx" -#define LIBXL_UUID_BYTES(uuid) uuid[0],
uuid[1], uuid[2], uuid[3], \ - uuid[4], uuid[5], uuid[6],
uuid[7], \

tools/libxl/libxl.h Fri Aug 20 16:14:11 2010 +0100 renamed from tools/libxl/libxl.h Fri Aug 20 16:03:28 2010 +0100 +1 -3
-            uuid[8], uuid[9], uuid[10], uuid[11], \
-            uuid[12], uuid[13], uuid[14], uuid[15] \
-
+#include "libxl_uuid.h"
 
 typedef uint8_t libxl_mac[6];

diff -r 56e9e0b9b624 tools/libxl/libxl_uuid.h

tools/libxl/libxl_uuid.h Fri Aug 20 16:14:11 2010 +0100 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +5 -0
@@ -0,0 +1,151 @@
+/* Copyright (c) 2008, XenSource Inc.
+ * 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.

tools/libxl/libxl_uuid.h Fri Aug 20 16:14:11 2010 +0100 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +5 -0
+*/
+#ifndef __LIBXL_UUID_H__
+#define __LIBXL_UUID_H__
+
+#define LIBXL_UUID_FMT

"%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02h hx%02hhx%02hhx%02hhx%02hhx" +

tools/libxl/libxl_uuid.h Fri Aug 20 16:14:11 2010 +0100 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +9 -0
+#if defined(__linux__)
+
+#include <uuid/uuid.h>
+
+typedef struct {
+    uuid_t uuid;
+} libxl_uuid;
+
+#define LIBXL_UUID_BYTES(arg) arg.uuid[0], arg.uuid[1], arg.uuid[2],

arg.uuid[3], \ + arg.uuid[4], arg.uuid[5], arg.uuid[6],
arg.uuid[7], \ + arg.uuid[8], arg.uuid[9], arg.uuid[10],
arg.uuid[11], \ + arg.uuid[12], arg.uuid[13], arg.uuid[14],
arg.uuid[15] +

tools/libxl/libxl_uuid.h Fri Aug 20 16:14:11 2010 +0100 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +11 -0
+static inline int libxl_uuid_is_nil(libxl_uuid *uuid)
+{
+       return uuid_is_null(uuid->uuid);
+}
+
+static inline void libxl_uuid_generate(libxl_uuid *uuid)
+{
+       uuid_generate(uuid->uuid);
+}
+
+static inline void libxl_uuido_string(libxl_uuid *uuid, char *out, size_t

size) +{

tools/libxl/libxl_uuid.h Fri Aug 20 16:14:11 2010 +0100 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +4 -0
+       uuid_unparse(uuid->uuid, out);
+}
+
+static inline void libxl_uuid_from_string(libxl_uuid *uuid, const char

*in) +{

tools/libxl/libxl_uuid.h Fri Aug 20 16:14:11 2010 +0100 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +48 -0
+       uuid_parse(in, uuid->uuid);
+}
+
+static inline void libxl_uuid_copy(libxl_uuid *dst, libxl_uuid *src)
+{
+       uuid_copy(dst->uuid, src->uuid);
+}
+
+static inline void libxl_uuid_clear(libxl_uuid *uuid)
+{
+       uuid_clear(uuid->uuid);
+}
+
+static inline int libxl_uuid_compare(libxl_uuid *uuid1, libxl_uuid *uuid2)
+{
+       return uuid_compare(uuid1->uuid, uuid2->uuid);
+}
+
+static inline const uint8_t *libxl_uuid_bytearray(libxl_uuid *uuid)
+{
+    return uuid->uuid;
+}
+
+#elif defined(__NetBSD__)
+
+#include <uuid.h>
+#include <string.h>
+#include <stdlib.h>
+
+typedef uuid_t libxl_uuid;
+#define LIBXL_UUID_BYTES(uuid) uuid[0], uuid[1], uuid[2], uuid[3], \
+            uuid[4], uuid[5], uuid[6], uuid[7], \
+            uuid[8], uuid[9], uuid[10], uuid[11], \
+            uuid[12], uuid[13], uuid[14], uuid[15]
+
+static inline int libxl_uuid_is_nil(libxl_uuid *uuid)
+{
+       uint32_t status;
+       return uuid_is_nil((uuid_t *)uuid, &status);
+}
+
+static inline void libxl_uuid_generate(libxl_uuid *uuid)
+{
+       uint32_t status;
+       uuid_create((uuid_t *)uuid, &status);
+}
+
+static inline void libxl_uuido_string(libxl_uuid *uuid, char *out, size_t

size) +{

tools/libxl/libxl_uuid.h Fri Aug 20 16:14:11 2010 +0100 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +8 -0
+       uint32_t status;
+       char *_out = NULL;
+       uuid_to_string((uuid_t *)uuid, &_out, &status);
+       strlcpy(out, _out, size);
+       free(_out);
+}
+
+static inline void libxl_uuid_from_string(libxl_uuid *uuid, const char

*in) +{

tools/libxl/libxl_uuid.h Fri Aug 20 16:14:11 2010 +0100 renamed from dev/null Thu Jan 01 00:00:00 1970 +0000 +32 -0
+       uint32_t status;
+       uuid_from_string(in, (uuid_t *)uuid, &status);
+}
+
+static inline void libxl_uuid_copy(libxl_uuid *dst, libxl_uuid *src)
+{
+       memcpy((uuid_t *)dst, (uuid_t *)src, sizeof(uuid_t));
+}
+
+static inline void libxl_uuid_clear(libxl_uuid *uuid)
+{
+       memset((uuid_t *)uuid, 0, sizeof(uuid_t));
+}
+
+static inline int libxl_uuid_compare(libxl_uuid *uuid1, libxl_uuid *uuid2)
+{
+       uint32_t status;
+       return uuid_compare((uuid_t *)uuid1, (uuid_t *)uuid2, &status);
+}
+
+static inline const uint8_t *libxl_uuid_bytearray(libxl_uuid *uuid)
+{
+    return uuid;
+}
+
+#else
+
+#error "Please update libxl_uuid.h for your OS"
+
+#endif
+
+#endif /* __LIBXL_UUID_H__ */

diff -r 56e9e0b9b624 tools/libxl/xl.c

tools/libxl/xl.c Fri Aug 20 16:14:11 2010 +0100 renamed from tools/libxl/xl.c Fri Aug 20 16:03:28 2010 +0100 +0 -2
@@ -69,8 +69,6 @@ int main(int argc, char **argv)
         exit(1);
     }
 
-    srand(time(0));
-
     cspec = cmdtable_lookup(cmd);
     if (cspec)
         ret = cspec->cmd_impl(argc, argv);

diff -r 56e9e0b9b624 tools/libxl/xl_cmdimpl.c

tools/libxl/xl_cmdimpl.c Fri Aug 20 16:14:11 2010 +0100 renamed from tools/libxl/xl_cmdimpl.c Fri Aug 20 16:03:28 2010 +0100 +14 -12
@@ -286,19 +286,12 @@ static void init_build_info(libxl_domain
     }
 }
 
-static void random_uuid(libxl_uuid *uuid)
-{
-    int i;
-    for (i = 0; i < 16; i++)
-        (*uuid)[i] = rand();
-}
-
 static void init_dm_info(libxl_device_model_info *dm_info,
         libxl_domain_create_info *c_info, libxl_domain_build_info *b_info)
 {
     memset(dm_info, '\0', sizeof(*dm_info));
 
-    random_uuid(&dm_info->uuid);
+    libxl_uuid_generate(&dm_info->uuid);
 
     dm_info->dom_name = c_info->name;
     dm_info->device_model = "qemu-dm";
@@ -325,6 +318,11 @@ static void init_dm_info(libxl_device_mo
 
 static void init_nic_info(libxl_device_nic *nic_info, int devnum)
 {
+    const uint8_t *r;
+    libxl_uuid uuid;
+
+    libxl_uuid_generate(&uuid);
+    r = libxl_uuid_bytearray(&uuid);
     memset(nic_info, '\0', sizeof(*nic_info));
 
     nic_info->backend_domid = 0;
@@ -335,9 +333,9 @@ static void init_nic_info(libxl_device_n
     nic_info->mac[0] = 0x00;
     nic_info->mac[1] = 0x16;
     nic_info->mac[2] = 0x3e;
-    nic_info->mac[3] = 1 + (int) (0x7f * (rand() / (RAND_MAX + 1.0)));
-    nic_info->mac[4] = 1 + (int) (0xff * (rand() / (RAND_MAX + 1.0)));
-    nic_info->mac[5] = 1 + (int) (0xff * (rand() / (RAND_MAX + 1.0)));
+    nic_info->mac[3] = r[0] & 0x7f;
+    nic_info->mac[4] = r[1];
+    nic_info->mac[5] = r[2];
     nic_info->ifname = NULL;
     nic_info->bridge = strdup("xenbr0");
     CHK_ERRNO( asprintf(&nic_info->script, "%s/vif-bridge",
@@ -347,21 +345,26 @@ static void init_nic_info(libxl_device_n
 
 static void init_net2_info(libxl_device_net2 *net2_info, int devnum)
 {
+    const uint8_t *r;
+    libxl_uuid uuid;
+
+    libxl_uuid_generate(&uuid);
+    r = libxl_uuid_bytearray(&uuid);
     memset(net2_info, '\0', sizeof(*net2_info));
 
     net2_info->devid = devnum;
     net2_info->front_mac[0] = 0x00;
     net2_info->front_mac[1] = 0x16;
     net2_info->front_mac[2] = 0x3e;;
-    net2_info->front_mac[3] = 1 + (int) (0x7f * (rand() / (RAND_MAX +

1.0))); - net2_info->front_mac[4] = 1 + (int) (0xff * (rand() /
(RAND_MAX + 1.0))); - net2_info->front_mac[5] = 1 + (int) (0xff *
(rand() / (RAND_MAX + 1.0))); + net2_info->front_mac[3] = 0x7f & r[0];

tools/libxl/xl_cmdimpl.c Fri Aug 20 16:14:11 2010 +0100 renamed from tools/libxl/xl_cmdimpl.c Fri Aug 20 16:03:28 2010 +0100 +2 -1
+    net2_info->front_mac[4] = r[1];
+    net2_info->front_mac[5] = r[2];
     net2_info->back_mac[0] = 0x00;
     net2_info->back_mac[1] = 0x16;
     net2_info->back_mac[2] = 0x3e;
-    net2_info->back_mac[3] = 1 + (int) (0x7f * (rand() / (RAND_MAX +

1.0))); - net2_info->back_mac[4] = 1 + (int) (0xff * (rand() / (RAND_MAX
+ 1.0))); - net2_info->back_mac[5] = 1 + (int) (0xff * (rand() /
(RAND_MAX + 1.0))); + net2_info->back_mac[3] = 0x7f & r[3];

tools/libxl/xl_cmdimpl.c Fri Aug 20 16:14:11 2010 +0100 renamed from tools/libxl/xl_cmdimpl.c Fri Aug 20 16:03:28 2010 +0100 +4 -2
+    net2_info->back_mac[4] = r[4];
+    net2_info->back_mac[5] = r[5];
     net2_info->back_trusted = 1;
     net2_info->filter_mac = 1;
     net2_info->max_bypasses = 5;
@@ -604,7 +607,7 @@ static void parse_config_data(const char
         c_info->name = strdup(buf);
     else
         c_info->name = "test";
-    random_uuid(&c_info->uuid);
+    libxl_uuid_generate(&c_info->uuid);
 
     if (!xlu_cfg_get_long(config, "oos", &l))
         c_info->oos = l;
@@ -1201,7 +1204,7 @@ static int preserve_domain(libxl_ctx *ct
         return 0;
     }
 
-    random_uuid(&new_uuid);
+    libxl_uuid_generate(&new_uuid);
 
     LOG("Preserving domain %d %s with suffix%s", domid,
 d_config->c_info.name, stime); rc = libxl_domain_preserve(ctx, domid,

&d_config->c_info, stime, new_uuid);

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
#2 lore raw

Christoph Egger writes ("Re: [Xen-devel] [PATCH, v3]: xl: randomly generate UUID's"):

Quoted 7 lines · On Friday 20 August 2010 17:15:21 Gianni Tedesco wrote:
Quoted 4 lines

Changes since last time:
- Re-based to remove orthogonal concern of UUID string formatting fixed in 22001:0b6f82eaaea9 "xl: make libxl_uuid2string internal to
libxenlight" - Incorporated Christoph Egger's suggestions

I will give this patch a try next week.

Great. Can you ack it please when you're done ? Unless you think it should go in right away. It looks pretty good to me but if you're willing to test it for portability I guess it can wait a few days.

Ian.

#3 lore raw
In reply to Christoph Egger
Quoted 8 lines · Christoph Egger
Quoted 4 lines · On Friday 20 August 2010 17:15:21 Gianni Tedesco wrote:

Changes since last time:
- Re-based to remove orthogonal concern of UUID string formatting fixed in 22001:0b6f82eaaea9 "xl: make libxl_uuid2string internal to
libxenlight" - Incorporated Christoph Egger's suggestions

I will give this patch a try next week.
Christoph

*ping* - any news? I think it's straightforward so should be good to go.

Gianni

#4 lore raw
Quoted 11 lines · On Wednesday 25 August 2010 20:38:25 Gianni Tedesco wrote:
Quoted 8 lines · Christoph Egger
Quoted 4 lines · On Friday 20 August 2010 17:15:21 Gianni Tedesco wrote:

Changes since last time:
- Re-based to remove orthogonal concern of UUID string formatting
fixed in 22001:0b6f82eaaea9 "xl: make libxl_uuid2string internal to libxenlight" - Incorporated Christoph Egger's suggestions

I will give this patch a try next week.
Christoph

*ping* - any news? I think it's straightforward so should be good to go.

I'm about reworking the pieces that don't compile. That is mainly the use of LIBXL_UUID_FMT causing warnings like 'subscripted value is neither array nor pointer'.

Christoph

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
#5 lore raw
Quoted 8 lines · On Thursday 26 August 2010 14:02:35 Christoph Egger wrote:
Quoted 7 lines · On Wednesday 25 August 2010 20:38:25 Gianni Tedesco wrote:
Quoted 6 lines · Christoph Egger
Quoted 4 lines · On Friday 20 August 2010 17:15:21 Gianni Tedesco wrote:

Changes since last time:
- Re-based to remove orthogonal concern of UUID string formatting
fixed in 22001:0b6f82eaaea9 "xl: make libxl_uuid2string internal to libxenlight" - Incorporated Christoph Egger's suggestions

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

I will give this patch a try next week.
Christoph

*ping* - any news? I think it's straightforward so should be good to go.

I'm about reworking the pieces that don't compile. That is mainly the use of LIBXL_UUID_FMT causing warnings like 'subscripted value is neither array nor pointer'.

Ok, here we go. The patch is against changeset 22068:3c4c3d48a835 and is not ready yet though, it needs to also
fix build for tools/ocaml/libs/xl/xl_stubs.c.

The build fails with
xl_stubs.c:143: error: subscripted value is neither array nor pointer.

I think using libxl_uuid_from_string() should do it but I'm not familiar with oxenstored.

I am not sure if the use of malloc() in libxl_uuid2string() is correct, someone familiar with the garbage collector please fix it.

Due to the mentioned caveats, I don't acknowledge this patch. Nonetheless, I am sending the patch out to not thwart Gianni to do his development work.
I want to re-test another version of this patch.

Christoph

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
tools/libxl/Makefile +3 -0
diff -r 8fc73880aea9 -r 30adef8fa3d2 tools/libxl/Makefile
@@ -16,6 +16,9 @@ CFLAGS += -I. -fPIC
 CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) $(CFLAGS_libxenstore) $(CFLAGS_libblktapctl)
 
 LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(UTIL_LIBS)
+ifeq ($(CONFIG_Linux),y)
+LIBS += -luuid
+endif
 
 LIBXL_OBJS-y = osdeps.o libxl_paths.o libxl_bootloader.o
 ifeq ($(LIBXL_BLKTAP),y)
tools/libxl/libxl.c +3 -3
diff -r 8fc73880aea9 -r 30adef8fa3d2 tools/libxl/libxl.c
@@ -127,7 +127,7 @@ int libxl_domain_make(libxl_ctx *ctx, li
     *domid = -1;
 
     /* Ultimately, handle is an array of 16 uint8_t, same as uuid */
-    memcpy(handle, info->uuid, sizeof(xen_domain_handle_t));
+    libxl_uuid_copy((libxl_uuid *)handle, &info->uuid);
 
     ret = xc_domain_create(ctx->xch, info->ssidref, handle, flags, domid);
     if (ret < 0) {
@@ -1502,8 +1502,8 @@ static int libxl_create_stubdom(libxl_ct
     memset(&c_info, 0x00, sizeof(libxl_domain_create_info));
     c_info.hvm = 0;
     c_info.name = libxl_sprintf(&gc, "%s-dm", _libxl_domid_to_name(&gc, info->domid));
-    for (i = 0; i < 16; i++)
-        c_info.uuid[i] = info->uuid[i];
+
+    libxl_uuid_copy(&c_info.uuid, &info->uuid);
 
     memset(&b_info, 0x00, sizeof(libxl_domain_build_info));
     b_info.max_vcpus = 1;
tools/libxl/libxl.h +1 -7
diff -r 8fc73880aea9 -r 30adef8fa3d2 tools/libxl/libxl.h
@@ -131,13 +131,7 @@
 #include <xs.h>
 #include <sys/wait.h> /* for pid_t */
 
-typedef uint8_t libxl_uuid[16];
-#define LIBXL_UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
-#define LIBXL_UUID_BYTES(uuid) uuid[0], uuid[1], uuid[2], uuid[3], \
-            uuid[4], uuid[5], uuid[6], uuid[7], \
-            uuid[8], uuid[9], uuid[10], uuid[11], \
-            uuid[12], uuid[13], uuid[14], uuid[15] \
-
+#include "libxl_uuid.h"
 
 typedef uint8_t libxl_mac[6];
 
tools/libxl/libxl_dom.c +10 -4
diff -r 8fc73880aea9 -r 30adef8fa3d2 tools/libxl/libxl_dom.c
@@ -442,11 +442,17 @@ int save_device_model(libxl_ctx *ctx, ui
     return 0;
 }
 
-char *libxl_uuid2string(libxl_gc *gc, const libxl_uuid uuid)
+char *libxl_uuid2string(libxl_gc *gc, libxl_uuid uuid)
 {
-    char *s = libxl_sprintf(gc, LIBXL_UUID_FMT, LIBXL_UUID_BYTES(uuid));
-    if (!s)
+    char *s;
+
+    s = malloc(LIBXL_UUID_LEN);
+    if (!s) {
         XL_LOG(libxl_gc_owner(gc), XL_LOG_ERROR, "cannot allocate for uuid");
+        return NULL;
+    }
+
+    libxl_uuido_string(&uuid, s, sizeof(s));
     return s;
 }
 
@@ -465,7 +471,7 @@ static const char *userdata_path(libxl_g
                      " for domain %"PRIu32, domid);
         return NULL;
     }
-    uuid_string = libxl_sprintf(gc, LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid));
+    uuid_string = libxl_uuid2string(gc, info.uuid);
 
     path = libxl_sprintf(gc, "/var/lib/xen/"
                          "userdata-%s.%s.%s",
tools/libxl/xl.c +0 -2
diff -r 8fc73880aea9 -r 30adef8fa3d2 tools/libxl/xl.c
@@ -74,8 +74,6 @@ int main(int argc, char **argv)
     argc -= optind;
     optind = 1;
 
-    srand(time(0));
-
     cspec = cmdtable_lookup(cmd);
     if (cspec)
         ret = cspec->cmd_impl(argc, argv);
tools/libxl/xl_cmdimpl.c +34 -24

144 lines not on this page · raw message

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#6 lore raw
Quoted 14 lines · Christoph Egger
tools/libxl/xl_cmdimpl.c +5 -2
@@ -2219,8 +2224,11 @@ static void list_domains(int verbose, co
                 info[i].dying ? 'd' : '-',
                 ((float)info[i].cpu_time / 1e9));
         free(domname);
-        if (verbose)
-            printf(" " LIBXL_UUID_FMT,
 LIBXL_UUID_BYTES(info[i].uuid));
+        if (verbose) {
+            char buf[LIBXL_UUID_LEN];
+            libxl_uuido_string(&info[i].uuid, buf, sizeof(buf));
+            printf(" %s", buf);
+        }
         putchar('\n');
     }
Quoted 1 line

}

Really? There's no way to keep the macro approach and get at the thing like an array of bytes? If that's the case then how can libxl_uuid_bytearray() that I introduced work correctly? I cannot tell because your patch does not include libxl_uuid.h ...

Also I am not sure about the ocaml wrapper stuff but I will look in to it for next time. I have to re-spin the patch to detect UUID parse errors anyway.

#7 lore raw
Quoted 11 lines · On Friday 27 August 2010 15:56:35 Gianni Tedesco wrote:
Quoted 10 lines · Christoph Egger
tools/libxl/xl_cmdimpl.c +3 -2
@@ -2219,8 +2224,11 @@ static void list_domains(int verbose, co
                 info[i].dying ? 'd' : '-',
                 ((float)info[i].cpu_time / 1e9));
         free(domname);
-        if (verbose)
-            printf(" " LIBXL_UUID_FMT,
 LIBXL_UUID_BYTES(info[i].uuid));
+        if (verbose) {
+            char buf[LIBXL_UUID_LEN];
+            libxl_uuido_string(&info[i].uuid, buf, sizeof(buf));
Quoted 8 lines
Quoted 5 lines
tools/libxl/xl_cmdimpl.c +2 -0
+            printf(" %s", buf);
+        }
         putchar('\n');
     }

}

Really? There's no way to keep the macro approach and get at the thing like an array of bytes?

Yes. gcc complains about 'subscripted value is neither array nor pointer'.

Quoted 2 lines

If that's the case then how can libxl_uuid_bytearray() that I introduced work correctly?

I removed it because its redundant to libxl_uuido_string(). A bytearray and a string is the same in C unless you use unicode.

Quoted 1 line

I cannot tell because your patch does not include libxl_uuid.h ...

Then it does implicit. gcc would have complained otherwise. We should use -Wmissing-declaration to be sure.

Quoted 3 lines

Also I am not sure about the ocaml wrapper stuff but I will look in to it for next time. I have to re-spin the patch to detect UUID parse errors anyway.

Thanks.

Christoph

Signature · 6 lines
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
#8 lore raw
Quoted 20 lines · Christoph Egger
Quoted 10 lines · On Friday 27 August 2010 15:56:35 Gianni Tedesco wrote:
Quoted 9 lines · Christoph Egger
tools/libxl/xl_cmdimpl.c +3 -2
@@ -2219,8 +2224,11 @@ static void list_domains(int verbose, co
                 info[i].dying ? 'd' : '-',
                 ((float)info[i].cpu_time / 1e9));
         free(domname);
-        if (verbose)
-            printf(" " LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info[i].uuid));
+        if (verbose) {
+            char buf[LIBXL_UUID_LEN];
+            libxl_uuido_string(&info[i].uuid, buf, sizeof(buf));
Quoted 8 lines

tools/libxl/xl_cmdimpl.c static void list_domains(int verbose, co · line 2234

Quoted 5 lines
tools/libxl/xl_cmdimpl.c +2 -0
+            printf(" %s", buf);
+        }
         putchar('\n');
     }
 }

Really? There's no way to keep the macro approach and get at the thing like an array of bytes?

Quoted 1 line

Yes. gcc complains about 'subscripted value is neither array nor pointer'.

Yes, my implementation may have been broken but was there a way to make it work? I assume there must be. Basically this allows us to avoid the use of a temporary buffer when printing UUID strings.

Quoted 5 lines
Quoted 2 lines

If that's the case then how can libxl_uuid_bytearray() that I introduced work correctly?

I removed it because its redundant to libxl_uuido_string(). A bytearray and a string is the same in C unless you use unicode.

I think we're talking accross purposes, the point of the libxl_uuid_bytearray is basically to cast the platform specific type to a uint8_t * so that we can access the uuid as a 'string' - this is different to a textual representation of a UUID.

I would be willing to bet money that this can always be done since it's the only reasonable way to represent a UUID internally.

Gianni