diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-13 18:29:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-13 18:29:28 +0000 |
| commit | 3a2e46ae1de4f45b88211306a2b6c0c5efd368ab (patch) | |
| tree | afe05674b79aa39807a56a1336741e8f2925729e | |
| parent | 026aaf47c02b79036feb830206cfebb2a726510d (diff) | |
| parent | 44acd46f60ce6f16d369cd443e77949deca56a2c (diff) | |
| download | qemu-3a2e46ae1de4f45b88211306a2b6c0c5efd368ab.zip qemu-3a2e46ae1de4f45b88211306a2b6c0c5efd368ab.tar.gz qemu-3a2e46ae1de4f45b88211306a2b6c0c5efd368ab.tar.bz2 | |
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>
| -rw-r--r-- | block/gluster.c | 2 | ||||
| -rw-r--r-- | block/sheepdog.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/block/gluster.c b/block/gluster.c index 63d3c37..296e036 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -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]" diff --git a/block/sheepdog.c b/block/sheepdog.c index 8680b29..797ea59 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -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; } |