Use full path when loading XML files

This commit is contained in:
Daniel P. Berrange 2008-07-11 17:59:27 +00:00
parent 381fa1fc46
commit a1b49bcdea
3 changed files with 16 additions and 2 deletions

View File

@ -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,

View File

@ -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")) {

View File

@ -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")) {