From: John Snow <jsnow@redhat.com>
Date: Wed, 26 Jun 2019 21:53:01 +0000 (-0400)
Subject: block/qcow: Improve error when opening qcow2 files as qcow
X-Git-Tag: v4.1.0-rc0~6^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=197bfa7da7c8eeb39aa50cd120cd1a9df9704878;p=thirdparty%2Fqemu.git

block/qcow: Improve error when opening qcow2 files as qcow

Reported-by: radmehrsaeed7@gmail.com
Fixes: https://bugs.launchpad.net/bugs/1832914
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/qcow.c b/block/qcow.c
index 6dee5bb7922..5bdf72ba33c 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.\n");
+        }
+
         ret = -ENOTSUP;
         goto fail;
     }