qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 93d8d1: iotests: Fix typo in iotest 051


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 93d8d1: iotests: Fix typo in iotest 051
Date: Tue, 30 Mar 2021 06:07:32 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 93d8d1293b7ebda45f07849cfc9698715c5748d6
      
https://github.com/qemu/qemu/commit/93d8d1293b7ebda45f07849cfc9698715c5748d6
  Author: Tao Xu <tao3.xu@intel.com>
  Date:   2021-03-29 (Mon, 29 Mar 2021)

  Changed paths:
    M tests/qemu-iotests/051
    M tests/qemu-iotests/051.pc.out

  Log Message:
  -----------
  iotests: Fix typo in iotest 051

There is an typo in iotest 051, correct it.

Signed-off-by: Tao Xu <tao3.xu@intel.com>
Message-Id: <20210324084321.90952-1-tao3.xu@intel.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: c00316e9b2abc75dcf5c8ba5608e35c2f4ec7983
      
https://github.com/qemu/qemu/commit/c00316e9b2abc75dcf5c8ba5608e35c2f4ec7983
  Author: Connor Kuehl <ckuehl@redhat.com>
  Date:   2021-03-29 (Mon, 29 Mar 2021)

  Changed paths:
    M tests/qemu-iotests/051.out

  Log Message:
  -----------
  iotests: fix 051.out expected output after error text touchups

A patch was recently applied that touched up some error messages that
pertained to key names like 'node-name'. The trouble is it only updated
tests/qemu-iotests/051.pc.out and not tests/qemu-iotests/051.out as
well.

Do that now.

Fixes: 785ec4b1b9 ("block: Clarify error messages pertaining to
'node-name'")
Signed-off-by: Connor Kuehl <ckuehl@redhat.com>
Message-Id: <20210318200949.1387703-2-ckuehl@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: d751448d4fe904d82db52d454fe85534992d167a
      
https://github.com/qemu/qemu/commit/d751448d4fe904d82db52d454fe85534992d167a
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-29 (Mon, 29 Mar 2021)

  Changed paths:
    M tests/qemu-iotests/116.out

  Log Message:
  -----------
  iotests/116: Fix reference output

15ce94a68ca ("block/qed: bdrv_qed_do_open: deal with errp") has improved
the qed driver's error reporting, though sadly did not add a test for
it.
The good news are: There already is such a test, namely 116.
The bad news are: Its reference output was not adjusted, and so now it
fails.

Let's fix the reference output, which has the nice side effect of
demonstrating 15ce94a68ca's improvements.

Fixes: 15ce94a68ca6730466c565c3d29971aab3087bf1
       ("block/qed: bdrv_qed_do_open: deal with errp")
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210326141419.156831-1-mreitz@redhat.com>


  Commit: ad0ce642799c15e3e5783bfcad60450c3f5687e1
      
https://github.com/qemu/qemu/commit/ad0ce642799c15e3e5783bfcad60450c3f5687e1
  Author: Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru>
  Date:   2021-03-29 (Mon, 29 Mar 2021)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: use external virtual timers

Regular virtual timers are used to emulate timings
related to vCPU and peripheral states. QCOW2 uses timers
to clean the cache. These timers should have external
flag. In the opposite case they affect the execution
and it can't be recorded and replayed.
This patch adds external flag to the timer for qcow2
cache clean.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <161700516327.1141158.8366564693714562536.stgit@pasha-ThinkPad-X280>
Signed-off-by: Max Reitz <mreitz@redhat.com>


  Commit: 6d7bb95180b9313c8deb65671e65174205b1fd83
      
https://github.com/qemu/qemu/commit/6d7bb95180b9313c8deb65671e65174205b1fd83
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-29 (Mon, 29 Mar 2021)

  Changed paths:
    M tests/qemu-iotests/046
    M tests/qemu-iotests/046.out

  Log Message:
  -----------
  iotests/046: Filter request length

For its concurrent requests, 046 has always filtered the offset,
probably because concurrent requests may settle in any order.  However,
it did not filter the request length, and so if requests with different
lengths settle in an unexpected order (notably the longer request before
the shorter request), the test fails (for no good reason).

Filter the length, too.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200918153323.108932-1-mreitz@redhat.com>


  Commit: 53431b9086b2832ca1aeff0c55e186e9ed79bd11
      
https://github.com/qemu/qemu/commit/53431b9086b2832ca1aeff0c55e186e9ed79bd11
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-29 (Mon, 29 Mar 2021)

  Changed paths:
    M block/mirror.c

  Log Message:
  -----------
  block/mirror: Fix mirror_top's permissions

mirror_top currently shares all permissions, and takes only the WRITE
permission (if some parent has taken that permission, too).

That is wrong, though; mirror_top is a filter, so it should take
permissions like any other filter does.  For example, if the parent
needs CONSISTENT_READ, we need to take that, too, and if it cannot share
the WRITE permission, we cannot share it either.

The exception is when mirror_top is used for active commit, where we
cannot take CONSISTENT_READ (because it is deliberately unshared above
the base node) and where we must share WRITE (so that it is shared for
all images in the backing chain, so the mirror job can take it for the
target BB).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210211172242.146671-2-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>


  Commit: 220222a0fecf0fbd9f49633abef552dd019ab9cd
      
https://github.com/qemu/qemu/commit/220222a0fecf0fbd9f49633abef552dd019ab9cd
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-29 (Mon, 29 Mar 2021)

  Changed paths:
    M docs/tools/qemu-storage-daemon.rst
    M storage-daemon/qemu-storage-daemon.c

  Log Message:
  -----------
  qsd: Document FUSE exports

Implementing FUSE exports required no changes to the storage daemon, so
we forgot to document them there.  Considering that both NBD and
vhost-user-blk exports are documented in its man page (and NBD exports
in its --help text), we should probably do the same for FUSE.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210217115844.62661-1-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>


  Commit: 484108293d94d80acd5a2f4332eaea5e2605947a
      
https://github.com/qemu/qemu/commit/484108293d94d80acd5a2f4332eaea5e2605947a
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-30 (Tue, 30 Mar 2021)

  Changed paths:
    M block/qcow2.c
    M tests/qemu-iotests/244.out

  Log Message:
  -----------
  qcow2: Force preallocation with data-file-raw

Setting the qcow2 data-file-raw bit means that you can ignore the
qcow2 metadata when reading from the external data file.  It does not
mean that you have to ignore it, though.  Therefore, the data read must
be the same regardless of whether you interpret the metadata or whether
you ignore it, and thus the L1/L2 tables must all be present and give a
1:1 mapping.

This patch changes 244's output: First, the qcow2 file is larger right
after creation, because of metadata preallocation.  Second, the qemu-img
map output changes: Everything that was not explicitly discarded or
zeroed is now a data area.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210326145509.163455-2-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>


  Commit: 2ec7e8a94668efccf7f45634584cfa19a83fc553
      
https://github.com/qemu/qemu/commit/2ec7e8a94668efccf7f45634584cfa19a83fc553
  Author: Max Reitz <mreitz@redhat.com>
  Date:   2021-03-30 (Tue, 30 Mar 2021)

  Changed paths:
    M tests/qemu-iotests/244
    M tests/qemu-iotests/244.out

  Log Message:
  -----------
  iotests/244: Test preallocation for data-file-raw

Three test cases:
(1) Adding a qcow2 (metadata) file to an existing data file, see whether
    we can read the existing data through the qcow2 image.
(2) Append data to the data file, grow the qcow2 image accordingly, see
    whether we can read the new data through the qcow2 image.
(3) At runtime, add a backing image to a freshly created qcow2 image
    with an external data file (with data-file-raw).  Reading data from
    the qcow2 image must return the same result as reading data from the
    data file, so everything in the backing image must be ignored.
    (This did not use to be the case, because without the L2 tables
    preallocated, all clusters would appear as unallocated, and so the
    qcow2 driver would fall through to the backing file.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210326145509.163455-3-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>


  Commit: 4a0ba67c77a425436e867fcbb8c513b44d7e7d6e
      
https://github.com/qemu/qemu/commit/4a0ba67c77a425436e867fcbb8c513b44d7e7d6e
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-03-30 (Tue, 30 Mar 2021)

  Changed paths:
    M block/mirror.c
    M block/qcow2.c
    M docs/tools/qemu-storage-daemon.rst
    M storage-daemon/qemu-storage-daemon.c
    M tests/qemu-iotests/046
    M tests/qemu-iotests/046.out
    M tests/qemu-iotests/051
    M tests/qemu-iotests/051.out
    M tests/qemu-iotests/051.pc.out
    M tests/qemu-iotests/116.out
    M tests/qemu-iotests/244
    M tests/qemu-iotests/244.out

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2021-03-30' 
into staging

Block patches for 6.0-rc1:
- Mark the qcow2 cache clean timer as external to fix record/replay
- Fix the mirror filter node's permissions so that an external process
  cannot grab an image while it is used as the mirror source
- Add documentation about FUSE exports to the storage daemon
- When creating a qcow2 image with the data-file-raw option, all
  metadata structures should be preallocated
- iotest fixes

# gpg: Signature made Tue 30 Mar 2021 13:38:40 BST
# gpg:                using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg:                issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2021-03-30:
  iotests/244: Test preallocation for data-file-raw
  qcow2: Force preallocation with data-file-raw
  qsd: Document FUSE exports
  block/mirror: Fix mirror_top's permissions
  iotests/046: Filter request length
  qcow2: use external virtual timers
  iotests/116: Fix reference output
  iotests: fix 051.out expected output after error text touchups
  iotests: Fix typo in iotest 051

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/7993b0f83fe5...4a0ba67c77a4



reply via email to

[Prev in Thread] Current Thread [Next in Thread]