External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 13:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix printing of pathnames on error in qemuDomainSnapshotLoad.

Browse Source 
While doing some testing of the snapshot code I noticed that
if qemuDomainSnapshotLoad failed, it would print a NULL as
part of the error.  That's not desirable, so leave the
full_path variable around until after we are done printing
errors.

Signed-off-by: Chris Lalancette <clalance@redhat.com>
This commit is contained in:
Chris Lalancette 2010-04-23 11:59:02 -04:00
parent 5993321dc5
commit 21c6cfc213
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_driver.c
View File

@ -1388,11 +1388,11 @@ static void qemuDomainSnapshotLoad(void *payload,
}
ret = virFileReadAll(fullpath, 1024*1024*1, &xmlStr);
VIR_FREE(fullpath);
if (ret < 0) {
/* Nothing we can do here, skip this one */
VIR_ERROR("Failed to read snapshot file %s: %s", fullpath,
virStrerror(errno, ebuf, sizeof(ebuf)));
VIR_FREE(fullpath);
continue;
}
@ -1400,12 +1400,14 @@ static void qemuDomainSnapshotLoad(void *payload,
if (def == NULL) {
/* Nothing we can do here, skip this one */
VIR_ERROR("Failed to parse snapshot XML from file '%s'", fullpath);
VIR_FREE(fullpath);
VIR_FREE(xmlStr);
continue;
}
virDomainSnapshotAssignDef(&vm->snapshots, def);
VIR_FREE(fullpath);
VIR_FREE(xmlStr);
}