From ed8a6d6a10e22536c50807e93e17de82d28c46e0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 9 Apr 2008 14:03:01 +0000 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ src/libvirt.c | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 453dc1378a..119bcdb9ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Apr 9 15:00:00 BST 2008 Richard W.M. Jones + + 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 Warn about conn, dom and net fields in virterror diff --git a/src/libvirt.c b/src/libvirt.c index 4bda97cb6e..e4a1c3bf0c 100644 --- 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); }