mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
iQIcBAABAgAGBQJap8PlAAoJEL2+eyfA3jBX+60P/0UvdH0ZzYJauRylqgrfQK0P
 HhqOuf+05e6P1CXF8ZMrGwL0aQOliCkbNyrMOm/J8uaQT+hJjS0GcndARcuWBBo8
 7ADs0sbJQPPquVbcDph3k1kzZJa1k5R5C3luHgQwFKBaRwciRDguWcn+USyfcH9f
 O+lTGolc+/7bGD8C9M18OHAOCLBQq1mu7S3rPVOdlleJNFBwLVzJfy6+TRmBeLIv
 +hPbpvE/tsfGh2lEYDZGXePBmHS/gGwrUjpFtPNKbRrvPqMkdsYXfrUqEFIVnkOV
 +oi5AvxtfF27vpj/wiYudzwD68cPKtXaMzROFNXuGrxRIwP+0fTrw2pEaSHdPccl
 6BTr2QmOQngeBApG+CnBY5oGmYeCQf4o3mtlDFS9zkxvyXeyuv6fNWQlk8NXIYpV
 26rC6gcn7OUXQ0J5Kn5CUleqvTuFvSz4XLAPr+7ZCxJWuCJIJwf1Gk/qkzY7Di/q
 Dg0ZoRBAQ8AUSNBPYZTy+xYE7W44aMsncMA/zJkhATS34Yzko2NIchBnreBE6/Q0
 f6em4Nw9/Z0xd3t2+8fy3EOCJ+WO0NGU0TVYESWsOigK8pjTNjaGnDx36z+OMOpC
 /3gHkCFk9xPHr4H/hgTtgTFIMnhF6im0NDXQvO7HrwwPH6OFiejbQx6YDiWEb4lb
 MKH0Y/v/JOvPHdBjrAfC
 =a+bS
 -----END PGP SIGNATURE-----

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: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2018-03-13 18:29:28 +00:00
commit 3a2e46ae1d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/gluster.c
View File

@ -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]"

2
block/sheepdog.c
View File

@ -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;
}