On 04/20/2014 04:13 PM, Peter Krempa wrote:
Replace the old structure with the new one. This change is a trivial name change operation (along with change of the freeing function). --- src/conf/domain_conf.c | 4 +-- src/conf/domain_conf.h | 2 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 16 +++++------ src/storage/storage_backend_fs.c | 4 +-- src/storage/storage_backend_gluster.c | 4 +-- src/util/virstoragefile.c | 54 +++++++++++++++++------------------ src/util/virstoragefile.h | 32 ++++++++++----------- tests/virstoragetest.c | 20 ++++++------- 9 files changed, 69 insertions(+), 69 deletions(-)
@@ -1182,7 +1182,7 @@ virStorageFileGetMetadataRecurse(const char *path, const char *canonPath, return -1; }
- virStorageFileMetadataPtr backing; + virStorageSourcePtr backing;
Merge conflict with my suggestions for 5/18; obvious resolution. Mechanical; ACK. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org