[PATCH] tests/qemu-iotest: fix iotest 024 with qed images

qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed

* [PATCH] tests/qemu-iotest: fix iotest 024 with qed images
@ 2025-11-12 17:09 Alberto Garcia
  2025-11-12 21:35 ` Eric Blake
  2025-11-13  7:29 ` Thomas Huth
  0 siblings, 2 replies; 4+ messages in thread
From: Alberto Garcia @ 2025-11-12 17:09 UTC (permalink / raw)
  To: qemu-devel
  Cc: Alberto Garcia, qemu-block, Kevin Wolf, Thomas Huth, qemu-stable

Use 'qemu-io -c map' instead of 'qemu-img map' to get an output that
works with both image types.

Cc: qemu-stable <qemu-stable@nongnu.org>
Fixes: 909852ba6b4a ("qemu-img rebase: don't exceed IO_BUF_SIZE in one operation")
Signed-off-by: Alberto Garcia <berto@igalia.com>
---
 tests/qemu-iotests/024     | 2 +-
 tests/qemu-iotests/024.out | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index 021169b4a1..10be2bd845 100755
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@@ -359,7 +359,7 @@ $QEMU_IO "$OVERLAY" -c "read -P 0x00  0 1M" | _filter_qemu_io
 $QEMU_IO "$OVERLAY" -c "read -P 0xff 1M 2M" | _filter_qemu_io
 $QEMU_IO "$OVERLAY" -c "read -P 0x00 3M 1M" | _filter_qemu_io
 
-$QEMU_IMG map "$OVERLAY" | _filter_qemu_img_map
+$QEMU_IO -c map "$OVERLAY" | _filter_qemu_io
 
 echo
 
diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out
index 1b7522ba71..da8fedc08b 100644
--- a/tests/qemu-iotests/024.out
+++ b/tests/qemu-iotests/024.out
@@ -266,7 +266,6 @@ read 2097152/2097152 bytes at offset 1048576
 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 read 1048576/1048576 bytes at offset 3145728
 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Offset          Length          File
-0               0x400000        TEST_DIR/subdir/t.IMGFMT
+4 MiB (0x400000) bytes     allocated at offset 0 bytes (0x0)
 
 *** done
-- 
2.47.3



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] tests/qemu-iotest: fix iotest 024 with qed images
  2025-11-12 17:09 [PATCH] tests/qemu-iotest: fix iotest 024 with qed images Alberto Garcia
@ 2025-11-12 21:35 ` Eric Blake
  2025-11-13  7:29 ` Thomas Huth
  1 sibling, 0 replies; 4+ messages in thread
From: Eric Blake @ 2025-11-12 21:35 UTC (permalink / raw)
  To: Alberto Garcia
  Cc: qemu-devel, qemu-block, Kevin Wolf, Thomas Huth, qemu-stable

On Wed, Nov 12, 2025 at 06:09:57PM +0100, Alberto Garcia wrote:
> Use 'qemu-io -c map' instead of 'qemu-img map' to get an output that
> works with both image types.
> 
> Cc: qemu-stable <qemu-stable@nongnu.org>
> Fixes: 909852ba6b4a ("qemu-img rebase: don't exceed IO_BUF_SIZE in one operation")
> Signed-off-by: Alberto Garcia <berto@igalia.com>
> ---
>  tests/qemu-iotests/024     | 2 +-
>  tests/qemu-iotests/024.out | 3 +--
>  2 files changed, 2 insertions(+), 3 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization:  qemu.org | libguestfs.org



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tests/qemu-iotest: fix iotest 024 with qed images
  2025-11-12 17:09 [PATCH] tests/qemu-iotest: fix iotest 024 with qed images Alberto Garcia
  2025-11-12 21:35 ` Eric Blake
@ 2025-11-13  7:29 ` Thomas Huth
  2025-11-13 22:42   ` Eric Blake
  1 sibling, 1 reply; 4+ messages in thread
From: Thomas Huth @ 2025-11-13  7:29 UTC (permalink / raw)
  To: Alberto Garcia, qemu-devel; +Cc: qemu-block, Kevin Wolf, qemu-stable

On 12/11/2025 18.09, Alberto Garcia wrote:
> Use 'qemu-io -c map' instead of 'qemu-img map' to get an output that
> works with both image types.
> 
> Cc: qemu-stable <qemu-stable@nongnu.org>
> Fixes: 909852ba6b4a ("qemu-img rebase: don't exceed IO_BUF_SIZE in one operation")
> Signed-off-by: Alberto Garcia <berto@igalia.com>
> ---
>   tests/qemu-iotests/024     | 2 +-
>   tests/qemu-iotests/024.out | 3 +--
>   2 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
> index 021169b4a1..10be2bd845 100755
> --- a/tests/qemu-iotests/024
> +++ b/tests/qemu-iotests/024
> @@ -359,7 +359,7 @@ $QEMU_IO "$OVERLAY" -c "read -P 0x00  0 1M" | _filter_qemu_io
>   $QEMU_IO "$OVERLAY" -c "read -P 0xff 1M 2M" | _filter_qemu_io
>   $QEMU_IO "$OVERLAY" -c "read -P 0x00 3M 1M" | _filter_qemu_io
>   
> -$QEMU_IMG map "$OVERLAY" | _filter_qemu_img_map
> +$QEMU_IO -c map "$OVERLAY" | _filter_qemu_io
>   
>   echo
>   
> diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out
> index 1b7522ba71..da8fedc08b 100644
> --- a/tests/qemu-iotests/024.out
> +++ b/tests/qemu-iotests/024.out
> @@ -266,7 +266,6 @@ read 2097152/2097152 bytes at offset 1048576
>   2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>   read 1048576/1048576 bytes at offset 3145728
>   1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -Offset          Length          File
> -0               0x400000        TEST_DIR/subdir/t.IMGFMT
> +4 MiB (0x400000) bytes     allocated at offset 0 bytes (0x0)
>   
>   *** done

Thanks!

Tested-by: Thomas Huth <thuth@redhat.com>



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tests/qemu-iotest: fix iotest 024 with qed images
  2025-11-13  7:29 ` Thomas Huth
@ 2025-11-13 22:42   ` Eric Blake
  0 siblings, 0 replies; 4+ messages in thread
From: Eric Blake @ 2025-11-13 22:42 UTC (permalink / raw)
  To: Thomas Huth
  Cc: Alberto Garcia, qemu-devel, qemu-block, Kevin Wolf, qemu-stable

On Thu, Nov 13, 2025 at 08:29:54AM +0100, Thomas Huth wrote:
> On 12/11/2025 18.09, Alberto Garcia wrote:
> > Use 'qemu-io -c map' instead of 'qemu-img map' to get an output that
> > works with both image types.
> > 
> > Cc: qemu-stable <qemu-stable@nongnu.org>
> > Fixes: 909852ba6b4a ("qemu-img rebase: don't exceed IO_BUF_SIZE in one operation")
> > Signed-off-by: Alberto Garcia <berto@igalia.com>
> > ---
> >   tests/qemu-iotests/024     | 2 +-
> >   tests/qemu-iotests/024.out | 3 +--
> >   2 files changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
> > index 021169b4a1..10be2bd845 100755
> > --- a/tests/qemu-iotests/024
> > +++ b/tests/qemu-iotests/024
> > @@ -359,7 +359,7 @@ $QEMU_IO "$OVERLAY" -c "read -P 0x00  0 1M" | _filter_qemu_io
> >   $QEMU_IO "$OVERLAY" -c "read -P 0xff 1M 2M" | _filter_qemu_io
> >   $QEMU_IO "$OVERLAY" -c "read -P 0x00 3M 1M" | _filter_qemu_io
> > -$QEMU_IMG map "$OVERLAY" | _filter_qemu_img_map
> > +$QEMU_IO -c map "$OVERLAY" | _filter_qemu_io
> >   echo
> > diff --git a/tests/qemu-iotests/024.out b/tests/qemu-iotests/024.out
> > index 1b7522ba71..da8fedc08b 100644
> > --- a/tests/qemu-iotests/024.out
> > +++ b/tests/qemu-iotests/024.out
> > @@ -266,7 +266,6 @@ read 2097152/2097152 bytes at offset 1048576
> >   2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> >   read 1048576/1048576 bytes at offset 3145728
> >   1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> > -Offset          Length          File
> > -0               0x400000        TEST_DIR/subdir/t.IMGFMT
> > +4 MiB (0x400000) bytes     allocated at offset 0 bytes (0x0)
> >   *** done
> 
> Thanks!
> 
> Tested-by: Thomas Huth <thuth@redhat.com>

Not exactly NBD related, but since I wanted a cleaner iotests run
before submitting my pull request, I went ahead and queued this
through my tree.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.
Virtualization:  qemu.org | libguestfs.org



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2025-11-13 22:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-12 17:09 [PATCH] tests/qemu-iotest: fix iotest 024 with qed images Alberto Garcia
2025-11-12 21:35 ` Eric Blake
2025-11-13  7:29 ` Thomas Huth
2025-11-13 22:42   ` Eric Blake

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).