From 82023923707c148ddd91eb3ac18fc9befc4288d5 Mon Sep 17 00:00:00 2001

From: Max Reitz <mreitz@redhat.com>

Date: Wed, 22 Jul 2015 16:24:55 +0200

Subject: [PATCH 3/5] block: Print its file name if backing file opening failed

Message-id: <1437582297-9244-2-git-send-email-mreitz@redhat.com>

Patchwork-id: 67106

O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/3] block: Print its file name if backing file opening failed

Bugzilla: 1238639

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

RH-Acked-by: Kevin Wolf <kwolf@redhat.com>

RH-Acked-by: Fam Zheng <famz@redhat.com>

From: Fam Zheng <famz@redhat.com>

If backing file doesn't exist, the error message is confusing and

misleading:

    $ qemu /tmp/a.qcow2

    qemu: could not open disk image /tmp/a.qcow2: Could not open file: No

    such file or directory

But...

    $ ls /tmp/a.qcow2

    /tmp/a.qcow2

    $ qemu-img info /tmp/a.qcow2

    image: /tmp/a.qcow2

    file format: qcow2

    virtual size: 8.0G (8589934592 bytes)

    disk size: 196K

    cluster_size: 65536

    backing file: /tmp/b.qcow2

Because...

    $ ls /tmp/b.qcow2

    ls: cannot access /tmp/b.qcow2: No such file or directory

This is not intuitive. It's better to have the missing file's name in

the error message. With this patch:

    $ qemu-io -c 'read 0 512' /tmp/a.qcow2

    qemu-io: can't open device /tmp/a.qcow2: Could not open backing

    file: Could not open '/stor/vm/arch.raw': No such file or directory

    no file open, try 'help open'

Which is a little bit better.

Signed-off-by: Fam Zheng <famz@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit b04b6b6ec3a1e0ba90c2f58617286d9fc35fa372)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

Conflicts:

	tests/qemu-iotests/082.out

	tests/qemu-iotests/114.out

When both tests were introduced downstream

(6b1816a687831a1622637ed10605759d9e90aa9c and

a0f50f0877463e9370ffa411bd826d7c704ab9fe, respectively), they were

modified from upstream because this patch had not been backported. These

changes are now reverted.

Signed-off-by: Max Reitz <mreitz@redhat.com>

---

 block.c                    | 4 +++-

 block/raw-posix.c          | 1 -

 block/raw-win32.c          | 1 -

 tests/qemu-iotests/051.out | 2 +-

 tests/qemu-iotests/069.out | 2 +-

 tests/qemu-iotests/082.out | 4 ++--

 tests/qemu-iotests/114.out | 2 +-

 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/block.c b/block.c

index e36fa2f..dedfa52 100644

--- a/block.c

+++ b/block.c

@@ -1050,7 +1050,9 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)

         bdrv_unref(bs->backing_hd);

         bs->backing_hd = NULL;

         bs->open_flags |= BDRV_O_NO_BACKING;

-        error_propagate(errp, local_err);

+        error_setg(errp, "Could not open backing file: %s",

+                   error_get_pretty(local_err));

+        error_free(local_err);

         return ret;

     }

diff --git a/block/raw-posix.c b/block/raw-posix.c

index 46b941b..72a9dc0 100644

--- a/block/raw-posix.c

+++ b/block/raw-posix.c

@@ -388,7 +388,6 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,

         if (ret == -EROFS) {

             ret = -EACCES;

         }

-        error_setg_errno(errp, -ret, "Could not open file");

         goto fail;

     }

     s->fd = fd;

diff --git a/block/raw-win32.c b/block/raw-win32.c

index ac20370..bb6dc6a 100644

--- a/block/raw-win32.c

+++ b/block/raw-win32.c

@@ -319,7 +319,6 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags,

         } else {

             ret = -EINVAL;

         }

-        error_setg_errno(errp, -ret, "Could not open file");

         goto fail;

     }

diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out

index 4fca1ca..32c94e5 100644

--- a/tests/qemu-iotests/051.out

+++ b/tests/qemu-iotests/051.out

@@ -169,6 +169,6 @@ Testing: -drive file=foo:bar

 QEMU_PROG: -drive file=foo:bar: could not open disk image foo:bar: Unknown protocol

 Testing: -drive file.filename=foo:bar

-QEMU_PROG: -drive file.filename=foo:bar: could not open disk image ide0-hd0: Could not open file: No such file or directory

+QEMU_PROG: -drive file.filename=foo:bar: could not open disk image ide0-hd0: Could not open 'foo:bar': No such file or directory

 *** done

diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out

index 3648814..b48306d 100644

--- a/tests/qemu-iotests/069.out

+++ b/tests/qemu-iotests/069.out

@@ -4,5 +4,5 @@ QA output created by 069

 Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072 

 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file='TEST_DIR/t.IMGFMT.base' 

-qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open file: No such file or directory

+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory

 *** done

diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out

index 8abfde7..41324d5 100644

--- a/tests/qemu-iotests/082.out

+++ b/tests/qemu-iotests/082.out

@@ -326,10 +326,10 @@ preallocation    Preallocation mode (allowed values: off, metadata, falloc, full

 lazy_refcounts   Postpone refcount updates

 Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2,,help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

-qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open file: No such file or directory

+qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing file: Could not open 'TEST_DIR/t.qcow2,help': No such file or directory

 Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2,,? TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

-qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open file: No such file or directory

+qemu-img: Could not open 'TEST_DIR/t.qcow2.base': Could not open backing file: Could not open 'TEST_DIR/t.qcow2,?': No such file or directory

 Testing: convert -O qcow2 -o backing_file=TEST_DIR/t.qcow2, -o help TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.base

 qemu-img: Invalid option list: backing_file=TEST_DIR/t.qcow2,

diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out

index de8f529..6c6b210 100644

--- a/tests/qemu-iotests/114.out

+++ b/tests/qemu-iotests/114.out

@@ -7,7 +7,7 @@ virtual size: 64M (67108864 bytes)

 cluster_size: 65536

 backing file: TEST_DIR/t.IMGFMT.base

 backing file format: foo

-qemu-io: can't open device TEST_DIR/t.qcow2: Unknown driver 'foo'

+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'

 read 4096/4096 bytes at offset 0

 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

 *** done

-- 

1.8.3.1