diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2018-02-06 10:52:04 +0000 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2018-03-13 08:06:55 -0400 |
| commit | 44acd46f60ce6f16d369cd443e77949deca56a2c (patch) | |
| tree | dd7ac78bbf751e760a2b5bd5202110ade9a860d4 | |
| parent | 834eddf22ec762839b724538c7be1d1d3b2d9d3b (diff) | |
| download | qemu-44acd46f60ce6f16d369cd443e77949deca56a2c.zip qemu-44acd46f60ce6f16d369cd443e77949deca56a2c.tar.gz qemu-44acd46f60ce6f16d369cd443e77949deca56a2c.tar.bz2 | |
block: include original filename when reporting invalid URIs
Consider passing a JSON based block driver to "qemu-img commit"
$ qemu-img commit 'json:{"driver":"qcow2","file":{"driver":"gluster",\
"volume":"gv0","path":"sn1.qcow2",
"server":[{"type":\
"tcp","host":"10.73.199.197","port":"24007"}]},}'
Currently it will commit the content and then report an incredibly
useless error message when trying to re-open the committed image:
qemu-img: invalid URI
Usage: file=gluster[+transport]://[host[:port]]volume/path[?socket=...][,file.debug=N][,file.logfile=/path/filename.log]
With this fix we get:
qemu-img: invalid URI json:{"server.0.host": "10.73.199.197",
"driver": "gluster", "path": "luks.qcow2", "server.0.type":
"tcp", "server.0.port": "24007", "volume": "gv0"}
Of course the root cause problem still exists, but now we know
what actually needs fixing.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 20180206105204.14817-1-berrange@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
| -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; } |