Use full path when loading XML files

diff --git a/ChangeLog b/ChangeLog
index 837cae36702cc6910f16ade8fa8d51424e13a5d1..b9ca93291a3ebd997120d608c976da7cddce335b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+Fri Jul 11 18:58:59 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/network_conf.c, src/domain_conf.c: Use full path when
+       opening XML files
+
+Fri Jul 11 18:34:59 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/qemu_conf.c, src/qemu_conf.h, src/qemu_driver.c: Switch
+       over to generic domain APIs
+       * tests/qemuxml2argvtest.c, tests/qemuxml2xmltest.c: Update
+       to new APIs
+       * tests/qemuxml2argvdata/: Update data files to match new
+       XML generation format
+
 Fri Jul 11 18:32:59 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/bridge.c, src/bridge.h, src/qemu_conf.c, src/qemu_conf.h,

diff --git a/src/domain_conf.c b/src/domain_conf.c
index dfb2eb049ce15c2983f10f99ff7f5ff0ec98f02e..e04debea37c08788db25076ec9e7576ada9467e6 100644 (file)
--- a/src/domain_conf.c
+++ b/src/domain_conf.c
@@ -2800,7 +2800,7 @@ virDomainObjPtr virDomainLoadConfig(virConnectPtr conn,
     if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0)
         goto error;
 
-    if (!(def = virDomainDefParseFile(conn, caps, file)))
+    if (!(def = virDomainDefParseFile(conn, caps, configFile)))
         goto error;
 
     if (!virFileMatchesNameSuffix(file, def->name, ".xml")) {

diff --git a/src/network_conf.c b/src/network_conf.c
index 6e7155e44a661f50e7e197fe83284871e5392740..d6fc0678d08e9faf042ef38343b626e1c01c1d7a 100644 (file)
--- a/src/network_conf.c
+++ b/src/network_conf.c
@@ -606,7 +606,7 @@ virNetworkObjPtr virNetworkLoadConfig(virConnectPtr conn,
     if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0)
         goto error;
 
-    if (!(def = virNetworkDefParseFile(conn, file)))
+    if (!(def = virNetworkDefParseFile(conn, configFile)))
         goto error;
 
     if (!virFileMatchesNameSuffix(file, def->name, ".xml")) {