fix reading of storage pool definitions at startup

* src/storage_conf.c: fix reading of storage pool definitions at startup
  patch by Cole Robinson
daniel

diff --git a/ChangeLog b/ChangeLog
index 372fc5d93e85ac3e72b50724fcf534aab347daa6..c9e47042efaa2b71674c7b54847e1ea20778c439 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 25 17:12:09 CEST 2009 Daniel Veillard <veillard@redhat.com>
+
+       * src/storage_conf.c: fix reading of storage pool definitions at startup
+         patch by Cole Robinson
+
 Thu Jun 25 16:57:40 CEST 2009 Daniel Veillard <veillard@redhat.com>
 
        * src/uml_driver.c: fix UML driver logging macros, patch by Amy

diff --git a/src/storage_conf.c b/src/storage_conf.c
index 63bc6df3fe73e3d7df729b52f75e06ab1f9c8c42..493eaa7492d741f18cfeffa39dfdaf18b0869399 100644 (file)
--- a/src/storage_conf.c
+++ b/src/storage_conf.c
@@ -1391,12 +1391,11 @@ virStoragePoolObjLoad(virConnectPtr conn,
                       virStoragePoolObjListPtr pools,
                       const char *file,
                       const char *path,
-                      const char *xml,
                       const char *autostartLink) {
     virStoragePoolDefPtr def;
     virStoragePoolObjPtr pool;
 
-    if (!(def = virStoragePoolDefParse(NULL, xml, file))) {
+    if (!(def = virStoragePoolDefParseFile(conn, path))) {
         return NULL;
     }
 
@@ -1450,7 +1449,6 @@ virStoragePoolLoadAllConfigs(virConnectPtr conn,
     }
 
     while ((entry = readdir(dir))) {
-        char *xml = NULL;
         char path[PATH_MAX];
         char autostartLink[PATH_MAX];
         virStoragePoolObjPtr pool;
@@ -1477,14 +1475,10 @@ virStoragePoolLoadAllConfigs(virConnectPtr conn,
             continue;
         }
 
-        if (virFileReadAll(path, 8192, &xml) < 0)
-            continue;
-
-        pool = virStoragePoolObjLoad(conn, pools, entry->d_name, path, xml, autostartLink);
+        pool = virStoragePoolObjLoad(conn, pools, entry->d_name, path,
+                                     autostartLink);
         if (pool)
             virStoragePoolObjUnlock(pool);
-
-        VIR_FREE(xml);
     }
 
     closedir(dir);