Commit 24897a76 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

gluster: default scheme to gluster:// and host to localhost. 

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f2917853

block/gluster.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }