Re: [Qemu-trivial] [Qemu-devel] [PATCH] block/qcow: Improve error when opening qcow2 files as qcow

[Kevin Wolf]

Am 27.06.2019 um 19:17 hat John Snow geschrieben:
> 
> 
> On 6/27/19 4:34 AM, Kevin Wolf wrote:
> > Am 26.06.2019 um 23:53 hat John Snow geschrieben:
> >> Reported-by: address@hidden
> >> Fixes: https://bugs.launchpad.net/bugs/1832914
> >> Signed-off-by: John Snow <address@hidden>
> >> ---
> >>  block/qcow.c | 7 ++++++-
> >>  1 file changed, 6 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/block/qcow.c b/block/qcow.c
> >> index 6dee5bb792..a9cb6ae0bd 100644
> >> --- a/block/qcow.c
> >> +++ b/block/qcow.c
> >> @@ -156,7 +156,12 @@ static int qcow_open(BlockDriverState *bs, QDict 
> >> *options, int flags,
> >>          goto fail;
> >>      }
> >>      if (header.version != QCOW_VERSION) {
> >> -        error_setg(errp, "Unsupported qcow version %" PRIu32, 
> >> header.version);
> >> +        error_setg(errp, "qcow (v%d) does not support qcow version %" 
> >> PRIu32,
> >> +                   QCOW_VERSION, header.version);
> >> +        if (header.version == 2 || header.version == 3) {
> >> +            error_append_hint(errp, "Try the 'qcow2' driver instead.");
> > 
> > I think we want a \n at the end here.
> > 
> 
> D'oh.
> 
> > Kevin
> 
> Can a maintainer pretty-please make the edit?

A maintainer did that now. (read: thanks, applied)

Kevin