On Sun, 02/09 10:48, Paolo Bonzini wrote:
> Currently, "gluster:///volname/img" and (using file. options)
> "file.driver=gluster,file.filename=foo" will segfault. Also,
> "//host/volname/img" will be rejected, but it is a valid URL
> that should be accepted just fine with "file.driver=gluster".
> Accept all of these, by inferring missing transport and host
> as TCP and localhost respectively.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> ---
> block/gluster.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/block/gluster.c b/block/gluster.c
> index a009b15..f9dd37f 100644
> --- a/block/gluster.c
> +++ b/block/gluster.c
> @@ -127,7 +127,7 @@ static int qemu_gluster_parseuri(GlusterConf *gconf,
> const char *filename)
> }
>
> /* transport */
> - if (!strcmp(uri->scheme, "gluster")) {
> + if (!uri->scheme || !strcmp(uri->scheme, "gluster")) {
> gconf->transport = g_strdup("tcp");
> } else if (!strcmp(uri->scheme, "gluster+tcp")) {
> gconf->transport = g_strdup("tcp");
> @@ -163,7 +163,7 @@ static int qemu_gluster_parseuri(GlusterConf *gconf,
> const char *filename)
> }
> gconf->server = g_strdup(qp->p[0].value);
> } else {
> - gconf->server = g_strdup(uri->server);
> + gconf->server = g_strdup(uri->server ? uri->server : "localhost");
> gconf->port = uri->port;
> }
>
> --
> 1.8.5.3
>
>
>
Reviewed-by: Fam Zheng <f...@redhat.com>
