Commit 3a2e46ae authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging 



# gpg: Signature made Tue 13 Mar 2018 12:28:21 GMT
# gpg:                using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg:                 aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg:                 aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98  D624 BDBE 7B27 C0DE 3057

* remotes/cody/tags/block-pull-request:
  block: include original filename when reporting invalid URIs

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 026aaf47 44acd46f

block/gluster.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static int qemu_gluster_parse(BlockdevOptionsGluster *gconf, 
    if (filename) {

        ret = qemu_gluster_parse_uri(gconf, filename);

        if (ret < 0) {

            error_setg(errp, "invalid URI");

            error_setg(errp, "invalid URI %s", filename);

            error_append_hint(errp, "Usage: file=gluster[+transport]://"

                                    "[host[:port]]volume/path[?socket=...]"

                                    "[,file.debug=N]"

block/sheepdog.c

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ static void sd_parse_uri(SheepdogConfig *cfg, const char *filename, 


    cfg->uri = uri = uri_parse(filename);

    if (!uri) {

        error_setg(&err, "invalid URI");

        error_setg(&err, "invalid URI '%s'", filename);

        goto out;

    }