Re: [libvirt] [PATCHv4 3/8] storage: implement rudimentary glusterfs pool refresh

On 11/25/2013 08:52 AM, Daniel P. Berrange wrote: Squashed this in and pushed (in reviewing 2/8, I noticed that I had documented that <key> should NOT start with a slash, but just the volume name). diff --git i/src/storage/storage_backend_gluster.c w/src/storage/storage_backend_gluster.c index 120cf0f..d57427e 100644 --- i/src/storage/storage_backend_gluster.c +++ w/src/storage/storage_backend_gluster.c @@ -41,8 +41,8 @@ struct _virStorageBackendGlusterState { * gluster[+transport]://[server[:port]]/vol/[dir/]image[?socket=...] */ virURI *uri; - char *volname; /* vol from URI */ - char *dir; /* dir from URI, or "/"; always ends in '/' */ + char *volname; /* vol from URI, no '/' */ + char *dir; /* dir from URI, or "/"; always starts and ends in '/' */ }; typedef struct _virStorageBackendGlusterState virStorageBackendGlusterState; @@ -86,7 +86,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool) if (dir) { if (*dir != '/') { virReportError(VIR_ERR_XML_ERROR, - _("gluster pool path '%s' must start with /"), + _("gluster pool path '%s' must start with /"), dir); return NULL; } @@ -173,7 +173,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state, goto cleanup; if (VIR_STRDUP(vol->name, name) < 0) goto cleanup; - if (virAsprintf(&vol->key, "/%s%s%s", state->volname, state->dir, + if (virAsprintf(&vol->key, "%s%s%s", state->volname, state->dir, vol->name) < 0) goto cleanup; -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org