From c402724354666fb7dddb41ab999e9efc1a91473c Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalance@redhat.com>
Date: Thu, 23 Oct 2008 13:21:01 +0000
Subject: [PATCH] Brown paper bag bug.  I didn't preserve the <sources> tags
 properly, and I didn't put the <source> tag into the proper place, so I
 totally changed the output of the discovery XML. Fix this up to do the right
 thing.

Signed-off-by: Chris Lalancette <clalance@redhat.com>
---
 ChangeLog          | 6 ++++++
 src/storage_conf.c | 7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 50f12fe8dd..0505ee4ee7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct 23 15:20:00 CEST 2008 Chris Lalancete <clalance@redhat.com>
+	* src/storage_conf.c: brown paper bag bug.  I didn't preserve the
+	<sources> tags properly, and I didn't put the <source> tag into the
+	proper place, so I totally changed the output of the discovery XML.
+	Fix this up to do the right thing.
+
 Thu Oct 23 15:11:03 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* include/libvirt/libvirt.h include/libvirt/libvirt.h.in
diff --git a/src/storage_conf.c b/src/storage_conf.c
index 386cfd542b..78647d6271 100644
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -1277,15 +1277,16 @@ char *virStoragePoolSourceListFormat(virConnectPtr conn ATTRIBUTE_UNUSED,
     int i, j;
     virBuffer buf = VIR_BUFFER_INITIALIZER;
 
-    virBufferAddLit(&buf, "<source>");
+    virBufferAddLit(&buf, "<sources>");
 
     for (i = 0; i < def->nsources; i++) {
-        virBufferVSprintf(&buf, "<name>%s</name>", def->sources[i].name);
+        virBufferVSprintf(&buf, "<source><name>%s</name>", def->sources[i].name);
         for (j = 0; j < def->sources[i].ndevice; j++)
             virBufferVSprintf(&buf, "<device path='%s'/>", def->sources[i].devices[j].path);
+	virBufferAddLit(&buf, "</source>");
     }
 
-    virBufferAddLit(&buf, "</source>");
+    virBufferAddLit(&buf, "</sources>");
 
     return virBufferContentAndReset(&buf);
 }