Core code contains Xen-ism UUID of dom0 = 0..0

        * src/libvirt.c: Remove a Xen-ism from the core code, the
          assumption that dom0's UUID is all zeroes.

diff --git a/ChangeLog b/ChangeLog
index 453dc1378a68fa8d8371b9ce268131a8c6ea6292..119bcdb9ffbc286858c31787a36eccc2c3250db9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr  9 15:00:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
+
+       Core code contains Xen-ism UUID of dom0 = 0..0
+       * src/libvirt.c: Remove a Xen-ism from the core code, the
+         assumption that dom0's UUID is all zeroes.
+
 Wed Apr  9 14:56:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
 
        Warn about conn, dom and net fields in virterror

diff --git a/src/libvirt.c b/src/libvirt.c
index 4bda97cb6e5b829c048ae24ff017cef59e1fc8cc..e4a1c3bf0cc653f1bcc11d8c8b2a7432073d08a4 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1794,11 +1794,8 @@ virDomainGetUUID(virDomainPtr domain, unsigned char *uuid)
         return (-1);
     }
 
-    if (domain->id == 0) {
-        memset(uuid, 0, VIR_UUID_BUFLEN);
-    } else {
-        memcpy(uuid, &domain->uuid[0], VIR_UUID_BUFLEN);
-    }
+    memcpy(uuid, &domain->uuid[0], VIR_UUID_BUFLEN);
+
     return (0);
 }