[PULL v2 0/2] Block patches

[PULL v2 0/2] Block patches

[Max Reitz]

The following changes since commit d88d5a3806d78dcfca648c62dae9d88d3e803bd2:

  Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-hw-20200622' into staging (2020-06-23 13:55:52 +0100)

are available in the Git repository at:

  https://github.com/XanClic/qemu.git tags/pull-block-2020-06-24

for you to fetch changes up to 24b861c0386a17ea31eb824310c21118fb7be883:

  iotests: don't test qcow2.py inside 291 (2020-06-24 10:00:04 +0200)

----------------------------------------------------------------
Block patches:
- Two iotest fixes

----------------------------------------------------------------
This is v2, where I dropped Maxim’s LUKS keyslot amendment series and my
iotest patches, because both caused iotest failures on some test
machines.
----------------------------------------------------------------
Philippe Mathieu-Daudé (1):
  iotests: Fix 051 output after qdev_init_nofail() removal

Vladimir Sementsov-Ogievskiy (1):
  iotests: don't test qcow2.py inside 291

 tests/qemu-iotests/051.pc.out |  4 ++--
 tests/qemu-iotests/291        |  4 ----
 tests/qemu-iotests/291.out    | 33 ---------------------------------
 3 files changed, 2 insertions(+), 39 deletions(-)

-- 
2.26.2

[PULL v2 1/2] iotests: Fix 051 output after qdev_init_nofail() removal

[Max Reitz]

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Commit 96927c744 replaced qdev_init_nofail() call by
isa_realize_and_unref() which has a different error
message. Update the test output accordingly.

Gitlab CI error after merging b77b5b3dc7:
https://gitlab.com/qemu-project/qemu/-/jobs/597414772#L4375

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200616154949.6586-1-philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/051.pc.out | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index 0ea80d35f0..da8ad87187 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -142,7 +142,7 @@ QEMU X.Y.Z monitor - type 'help' for more information
 
 Testing: -drive if=ide
 QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: Initialization of device ide-hd failed: Device needs media, but drive is empty
+(qemu) QEMU_PROG: Device needs media, but drive is empty
 
 Testing: -drive if=virtio
 QEMU X.Y.Z monitor - type 'help' for more information
@@ -214,7 +214,7 @@ QEMU X.Y.Z monitor - type 'help' for more information
 
 Testing: -drive file=TEST_DIR/t.qcow2,if=ide,readonly=on
 QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) QEMU_PROG: Initialization of device ide-hd failed: Block node is read-only
+(qemu) QEMU_PROG: Block node is read-only
 
 Testing: -drive file=TEST_DIR/t.qcow2,if=virtio,readonly=on
 QEMU X.Y.Z monitor - type 'help' for more information
-- 
2.26.2

[PULL v2 2/2] iotests: don't test qcow2.py inside 291

[Max Reitz]

From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

820c6bee534ec3b added testing of qcow2.py into 291, and it breaks 291
with external data file. Actually, 291 is bad place for qcow2.py
testing, better add a separate test.

For now, drop qcow2.py testing from 291 to fix the regression.

Fixes: 820c6bee534ec3b
Reported-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200618154052.8629-1-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/291     |  4 ----
 tests/qemu-iotests/291.out | 33 ---------------------------------
 2 files changed, 37 deletions(-)

diff --git a/tests/qemu-iotests/291 b/tests/qemu-iotests/291
index 28e4fb9b4d..1e0bb76959 100755
--- a/tests/qemu-iotests/291
+++ b/tests/qemu-iotests/291
@@ -64,8 +64,6 @@ $QEMU_IO -c 'w 1M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
 $QEMU_IMG bitmap --disable -f $IMGFMT "$TEST_IMG" b1
 $QEMU_IMG bitmap --enable -f $IMGFMT "$TEST_IMG" b2
 $QEMU_IO -c 'w 2M 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
-echo "Check resulting qcow2 header extensions:"
-$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 
 echo
 echo "=== Bitmap preservation not possible to non-qcow2 ==="
@@ -92,8 +90,6 @@ $QEMU_IMG bitmap --merge tmp -f $IMGFMT "$TEST_IMG" b0
 $QEMU_IMG bitmap --remove --image-opts \
     driver=$IMGFMT,file.driver=file,file.filename="$TEST_IMG" tmp
 _img_info --format-specific
-echo "Check resulting qcow2 header extensions:"
-$PYTHON qcow2.py "$TEST_IMG" dump-header-exts
 
 echo
 echo "=== Check bitmap contents ==="
diff --git a/tests/qemu-iotests/291.out b/tests/qemu-iotests/291.out
index 08bfaaaa6b..9f661515b4 100644
--- a/tests/qemu-iotests/291.out
+++ b/tests/qemu-iotests/291.out
@@ -14,25 +14,6 @@ wrote 1048576/1048576 bytes at offset 1048576
 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 wrote 1048576/1048576 bytes at offset 2097152
 1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Check resulting qcow2 header extensions:
-Header extension:
-magic                     0xe2792aca (Backing format)
-length                    5
-data                      'qcow2'
-
-Header extension:
-magic                     0x6803f857 (Feature table)
-length                    336
-data                      <binary>
-
-Header extension:
-magic                     0x23852875 (Bitmaps)
-length                    24
-nb_bitmaps                2
-reserved32                0
-bitmap_directory_size     0x40
-bitmap_directory_offset   0x510000
-
 
 === Bitmap preservation not possible to non-qcow2 ===
 
@@ -84,20 +65,6 @@ Format specific information:
             granularity: 65536
     refcount bits: 16
     corrupt: false
-Check resulting qcow2 header extensions:
-Header extension:
-magic                     0x6803f857 (Feature table)
-length                    336
-data                      <binary>
-
-Header extension:
-magic                     0x23852875 (Bitmaps)
-length                    24
-nb_bitmaps                3
-reserved32                0
-bitmap_directory_size     0x60
-bitmap_directory_offset   0x520000
-
 
 === Check bitmap contents ===
 
-- 
2.26.2

Re: [PULL v2 0/2] Block patches

[Max Reitz]

[-- Attachment #1.1: Type: text/plain, Size: 1003 bytes --]

On 24.06.20 10:13, Max Reitz wrote:
> The following changes since commit d88d5a3806d78dcfca648c62dae9d88d3e803bd2:
> 
>   Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-hw-20200622' into staging (2020-06-23 13:55:52 +0100)
> 
> are available in the Git repository at:
> 
>   https://github.com/XanClic/qemu.git tags/pull-block-2020-06-24
> 
> for you to fetch changes up to 24b861c0386a17ea31eb824310c21118fb7be883:
> 
>   iotests: don't test qcow2.py inside 291 (2020-06-24 10:00:04 +0200)
> 
> ----------------------------------------------------------------
> Block patches:
> - Two iotest fixes
> 
> ----------------------------------------------------------------
> This is v2, where I dropped Maxim’s LUKS keyslot amendment series and my
> iotest patches, because both caused iotest failures on some test
> machines.

Ping?

Or should I just send another pull request that includes Maxim’s
original series to supersede this one altogether?

Max


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL v2 0/2] Block patches

[Peter Maydell]

On Fri, 3 Jul 2020 at 10:52, Max Reitz <mreitz@redhat.com> wrote:
>
> On 24.06.20 10:13, Max Reitz wrote:
> > The following changes since commit d88d5a3806d78dcfca648c62dae9d88d3e803bd2:
> >
> >   Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-hw-20200622' into staging (2020-06-23 13:55:52 +0100)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/XanClic/qemu.git tags/pull-block-2020-06-24
> >
> > for you to fetch changes up to 24b861c0386a17ea31eb824310c21118fb7be883:
> >
> >   iotests: don't test qcow2.py inside 291 (2020-06-24 10:00:04 +0200)
> >
> > ----------------------------------------------------------------
> > Block patches:
> > - Two iotest fixes
> >
> > ----------------------------------------------------------------
> > This is v2, where I dropped Maxim’s LUKS keyslot amendment series and my
> > iotest patches, because both caused iotest failures on some test
> > machines.
>
> Ping?
>
> Or should I just send another pull request that includes Maxim’s
> original series to supersede this one altogether?

Sorry, your resend just fell out of my to-process queue for some
reason; I can put it back in the list to process.

-- PMM

Re: [PULL v2 0/2] Block patches

[Max Reitz]

[-- Attachment #1.1: Type: text/plain, Size: 1321 bytes --]

On 03.07.20 12:47, Peter Maydell wrote:
> On Fri, 3 Jul 2020 at 10:52, Max Reitz <mreitz@redhat.com> wrote:
>>
>> On 24.06.20 10:13, Max Reitz wrote:
>>> The following changes since commit d88d5a3806d78dcfca648c62dae9d88d3e803bd2:
>>>
>>>   Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-hw-20200622' into staging (2020-06-23 13:55:52 +0100)
>>>
>>> are available in the Git repository at:
>>>
>>>   https://github.com/XanClic/qemu.git tags/pull-block-2020-06-24
>>>
>>> for you to fetch changes up to 24b861c0386a17ea31eb824310c21118fb7be883:
>>>
>>>   iotests: don't test qcow2.py inside 291 (2020-06-24 10:00:04 +0200)
>>>
>>> ----------------------------------------------------------------
>>> Block patches:
>>> - Two iotest fixes
>>>
>>> ----------------------------------------------------------------
>>> This is v2, where I dropped Maxim’s LUKS keyslot amendment series and my
>>> iotest patches, because both caused iotest failures on some test
>>> machines.
>>
>> Ping?
>>
>> Or should I just send another pull request that includes Maxim’s
>> original series to supersede this one altogether?
> 
> Sorry, your resend just fell out of my to-process queue for some
> reason; I can put it back in the list to process.

That’d be great, thanks!

Max


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PULL v2 0/2] Block patches

[Peter Maydell]

On Fri, 3 Jul 2020 at 12:14, Max Reitz <mreitz@redhat.com> wrote:
>
> On 03.07.20 12:47, Peter Maydell wrote:
> > On Fri, 3 Jul 2020 at 10:52, Max Reitz <mreitz@redhat.com> wrote:
> >>
> >> On 24.06.20 10:13, Max Reitz wrote:
> >>> The following changes since commit d88d5a3806d78dcfca648c62dae9d88d3e803bd2:
> >>>
> >>>   Merge remote-tracking branch 'remotes/philmd-gitlab/tags/renesas-hw-20200622' into staging (2020-06-23 13:55:52 +0100)
> >>>
> >>> are available in the Git repository at:
> >>>
> >>>   https://github.com/XanClic/qemu.git tags/pull-block-2020-06-24
> >>>
> >>> for you to fetch changes up to 24b861c0386a17ea31eb824310c21118fb7be883:
> >>>
> >>>   iotests: don't test qcow2.py inside 291 (2020-06-24 10:00:04 +0200)
> >>>
> >>> ----------------------------------------------------------------
> >>> Block patches:
> >>> - Two iotest fixes
> >>>
> >>> ----------------------------------------------------------------
> >>> This is v2, where I dropped Maxim’s LUKS keyslot amendment series and my
> >>> iotest patches, because both caused iotest failures on some test
> >>> machines.
> >>
> >> Ping?
> >>
> >> Or should I just send another pull request that includes Maxim’s
> >> original series to supersede this one altogether?
> >
> > Sorry, your resend just fell out of my to-process queue for some
> > reason; I can put it back in the list to process.
>
> That’d be great, thanks!


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.1
for any user-visible changes.

-- PMM