Message ID | 20180206105204.14817-1-berrange@redhat.com |
---|---|
State | New |
Headers | show |
Series | block: include original filename when reporting invalid URIs | expand |
On 02/06/2018 04:52 AM, Daniel P. Berrangé wrote: > 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> > --- > block/gluster.c | 2 +- > block/sheepdog.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On Tue, Feb 06, 2018 at 10:52:04AM +0000, Daniel P. Berrangé wrote: > 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> > --- > block/gluster.c | 2 +- > block/sheepdog.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Jeff: Ping > diff --git a/block/gluster.c b/block/gluster.c > index 0f4265a3a4..0215e19087 100644 > --- a/block/gluster.c > +++ b/block/gluster.c > @@ -660,7 +660,7 @@ static struct glfs *qemu_gluster_init(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 f684477328..c847ab6c98 100644 > --- a/block/sheepdog.c > +++ b/block/sheepdog.c > @@ -1050,7 +1050,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; > } > > -- > 2.14.3 > >
On Tue, Feb 06, 2018 at 10:52:04AM +0000, Daniel P. Berrangé wrote: > 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> > --- > block/gluster.c | 2 +- > block/sheepdog.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/block/gluster.c b/block/gluster.c > index 0f4265a3a4..0215e19087 100644 > --- a/block/gluster.c > +++ b/block/gluster.c > @@ -660,7 +660,7 @@ static struct glfs *qemu_gluster_init(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 f684477328..c847ab6c98 100644 > --- a/block/sheepdog.c > +++ b/block/sheepdog.c > @@ -1050,7 +1050,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; > } > > -- > 2.14.3 > Thanks, Applied to my block branch: git://github.com/codyprime/qemu-kvm-jtc block -Jeff
diff --git a/block/gluster.c b/block/gluster.c index 0f4265a3a4..0215e19087 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -660,7 +660,7 @@ static struct glfs *qemu_gluster_init(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 f684477328..c847ab6c98 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1050,7 +1050,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; }
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> --- block/gluster.c | 2 +- block/sheepdog.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)