Skip to contentSkip to conversation

qemu-img: fix info --backing-chain --image-opts

PATCH Applied Stefan Hajnoczi 4 participants 4 messages Dec 5, 2019 – Dec 10, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qemu-img: fix info --backing-chain --image-opts

Only apply --image-opts to the topmost image when listing an entire backing chain. It is incorrect to treat backing filenames as image options. Assuming we have the backing chain t.IMGFMT.base <- t.IMGFMT.mid <- t.IMGFMT, qemu-img info fails as follows:

  $ qemu-img info --backing-chain --image-opts \
      driver=qcow2,file.driver=file,file.filename=t.IMGFMT
  qemu-img: Could not open 'TEST_DIR/t.IMGFMT.mid': Cannot find device=TEST_DIR/t.IMGFMT.mid nor node_name=TEST_DIR/t.IMGFMT.mid
---
 qemu-img.c                 |  3 ++
 tests/qemu-iotests/279     | 56 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/279.out | 35 ++++++++++++++++++++++++
 tests/qemu-iotests/group   |  1 +
 4 files changed, 95 insertions(+)
 create mode 100755 tests/qemu-iotests/279
 create mode 100644 tests/qemu-iotests/279.out
qemu-img.c +3 -0
index 95a24b9762..6233b8ca56 100644
@@ -2680,7 +2680,10 @@ static ImageInfoList *collect_image_info_list(bool image_opts,
 
         blk_unref(blk);
 
+        /* Clear parameters that only apply to the topmost image */
         filename = fmt = NULL;
+        image_opts = false;
+
         if (chain) {
             if (info->has_full_backing_filename) {
                 filename = info->full_backing_filename;
tests/qemu-iotests/279 new file +56 -0

56 lines not on this page · raw message

tests/qemu-iotests/279.out new file +35 -0
new file mode 100644
index 0000000000..f4dc6c69cb
@@ -0,0 +1,35 @@
+QA output created by 279
+Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864
+Formatting 'TEST_DIR/t.IMGFMT.mid', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.base
+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t.IMGFMT.mid
+
+== qemu-img info --backing-chain ==
+image: TEST_DIR/t.IMGFMT
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+backing file: TEST_DIR/t.IMGFMT.mid
+
+image: TEST_DIR/t.IMGFMT.mid
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+backing file: TEST_DIR/t.IMGFMT.base
+
+image: TEST_DIR/t.IMGFMT.base
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+
+== qemu-img info --backing-chain --image-opts ==
+image: TEST_DIR/t.IMGFMT
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+backing file: TEST_DIR/t.IMGFMT.mid
+
+image: TEST_DIR/t.IMGFMT.mid
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+backing file: TEST_DIR/t.IMGFMT.base
+
+image: TEST_DIR/t.IMGFMT.base
+file format: IMGFMT
+virtual size: 64 MiB (67108864 bytes)
+*** done
tests/qemu-iotests/group +1 -0
index 6b10a6a762..eb57ddc72c 100644
@@ -286,3 +286,4 @@
 272 rw
 273 backing quick
 277 rw quick
+279 rw backing quick
Signature · 1 line
2.23.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Stefan Hajnoczi

Only apply --image-opts to the topmost image when listing an entire backing chain. It is incorrect to treat backing filenames as image options. Assuming we have the backing chain t.IMGFMT.base <- t.IMGFMT.mid <- t.IMGFMT, qemu-img info fails as follows:

   $ qemu-img info --backing-chain --image-opts \
       driver=qcow2,file.driver=file,file.filename=t.IMGFMT
   qemu-img: Could not open 'TEST_DIR/t.IMGFMT.mid': Cannot find device=TEST_DIR/t.IMGFMT.mid nor node_name=TEST_DIR/t.IMGFMT.mid

Cute failure. Yes, the fix seems right.

Quoted 10 lines
---
  qemu-img.c                 |  3 ++
  tests/qemu-iotests/279     | 56 ++++++++++++++++++++++++++++++++++++++
  tests/qemu-iotests/279.out | 35 ++++++++++++++++++++++++
  tests/qemu-iotests/group   |  1 +
  4 files changed, 95 insertions(+)

create mode 100755 tests/qemu-iotests/279
create mode 100644 tests/qemu-iotests/279.out

Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Reviewed-by on v1 1/1
#2 lore raw
In reply to Stefan Hajnoczi
Quoted 10 lines · Stefan Hajnoczi

Only apply --image-opts to the topmost image when listing an entire backing chain. It is incorrect to treat backing filenames as image options. Assuming we have the backing chain t.IMGFMT.base <- t.IMGFMT.mid <- t.IMGFMT, qemu-img info fails as follows:

  $ qemu-img info --backing-chain --image-opts \
      driver=qcow2,file.driver=file,file.filename=t.IMGFMT
  qemu-img: Could not open 'TEST_DIR/t.IMGFMT.mid': Cannot find device=TEST_DIR/t.IMGFMT.mid nor node_name=TEST_DIR/t.IMGFMT.mid

Berto

Applied
#3 lore raw
In reply to Stefan Hajnoczi

Am 05.12.2019 um 14:46 hat Stefan Hajnoczi geschrieben:

Quoted 35 lines

Only apply --image-opts to the topmost image when listing an entire backing chain. It is incorrect to treat backing filenames as image options. Assuming we have the backing chain t.IMGFMT.base <- t.IMGFMT.mid <- t.IMGFMT, qemu-img info fails as follows:

  $ qemu-img info --backing-chain --image-opts \
      driver=qcow2,file.driver=file,file.filename=t.IMGFMT
  qemu-img: Could not open 'TEST_DIR/t.IMGFMT.mid': Cannot find device=TEST_DIR/t.IMGFMT.mid nor node_name=TEST_DIR/t.IMGFMT.mid
tests/qemu-iotests/279 new file +18 -0
new file mode 100755
index 0000000000..b555a92859
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# Test qemu-img --backing-chain --image-opts
+#
+# Copyright (C) 2019 Red Hat, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

tests/qemu-iotests/279 line 28

Quoted 10 lines
tests/qemu-iotests/279 new file +10 -0
+#
+
+seq=$(basename "$0")
+echo "QA output created by $seq"
+
+status=1	# failure is the default!
+
+_cleanup()
+{
+    _cleanup_test_img

I'm squashing in this fixup:

tests/qemu-iotests/279 +1 -0
index b555a92859..6682376808 100755
@@ -26,6 +26,7 @@ status=1      # failure is the default!
 _cleanup()
 {
     _cleanup_test_img
+    rm -f "$TEST_IMG.mid"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 

Thanks, applied to the block branch.

Kevin