[Qemu-commits] [qemu/qemu] 88e1f9: iotests: Remove a few tests from 'quick' group

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 88e1f9274522929fc5f9b553df9e68e135d1ef2e
      
https://github.com/qemu/qemu/commit/88e1f9274522929fc5f9b553df9e68e135d1ef2e
  Author: Eric Blake <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M tests/qemu-iotests/group

  Log Message:
  -----------
  iotests: Remove a few tests from 'quick' group

A run of './check -qcow2 -g quick' on my machine produced only
two tests that took longer than 5 seconds; 178 took 18, and
189 took 7.  Remove them from the quick group.

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 6c98c57af3f4fab85bdf5f01616c91322bd4312a
      
https://github.com/qemu/qemu/commit/6c98c57af3f4fab85bdf5f01616c91322bd4312a
  Author: Eric Blake <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M block/dirty-bitmap.c

  Log Message:
  -----------
  dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented

We've been documenting the value in bytes since its introduction
in commit b9a9b3a4 (v1.3), where it was actually reported in bytes.

Commit e4654d2 (v2.0) then removed things from block/qapi.c, in
preparation for a rewrite to a list of dirty sectors in the next
commit 21b5683 in block.c, but the new code mistakenly started
reporting in sectors.

Fixes: https://bugzilla.redhat.com/1441460

CC: address@hidden
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 24bae02b197d152c2b3e4e0ba95f7942a63bad32
      
https://github.com/qemu/qemu/commit/24bae02b197d152c2b3e4e0ba95f7942a63bad32
  Author: Eric Blake <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Fix sector calculation in qcow2_measure()

We used MAX() instead of the intended MIN() when computing how many
sectors to view in the current loop iteration of qcow2_measure(),
and passed in a value of INT_MAX sectors instead of our more usual
limit of BDRV_REQUEST_MAX_SECTORS (the latter avoids 32-bit overflow
on conversion to bytes).  For small files, the bug is harmless:
bdrv_get_block_status_above() clamps its *pnum answer to the BDS
size, regardless of any insanely larger input request.  However, for
any file at least 2T in size, we can very easily end up going into an
infinite loop (the maximum of 0x100000000 sectors and INT_MAX is a
64-bit quantity, which becomes 0 when assigned to int; once nb_sectors
is 0, we never make progress).

Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: d3c8c67469ee70fcae116d5abc277a7ebc8a19fd
      
https://github.com/qemu/qemu/commit/d3c8c67469ee70fcae116d5abc277a7ebc8a19fd
  Author: Kevin Wolf <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M block.c
    M block/commit.c
    M block/mirror.c
    M block/qapi.c
    M include/block/block.h
    M include/block/block_int.h
    M qapi/block-core.json
    M tests/qemu-iotests/040
    M tests/qemu-iotests/040.out
    M tests/qemu-iotests/041
    M tests/qemu-iotests/041.out

  Log Message:
  -----------
  block: Skip implicit nodes in query-block/blockstats

Commits 0db832f and 6cdbceb introduced the automatic insertion of filter
nodes above the top layer of mirror and commit block jobs. The
assumption made there was that since libvirt doesn't do node-level
management of the block layer yet, it shouldn't be affected by added
nodes.

This is true as far as commands issued by libvirt are concerned. It only
uses BlockBackend names to address nodes, so any operations it performs
still operate on the root of the tree as intended.

However, the assumption breaks down when you consider query commands,
which return data for the wrong node now. These commands also return
information on some child nodes (bs->file and/or bs->backing), which
libvirt does make use of, and which refer to the wrong nodes, too.

One of the consequences is that oVirt gets wrong information about the
image size and stops the VM in response as long as a mirror or commit
job is running:

https://bugzilla.redhat.com/show_bug.cgi?id=1470634

This patch fixes the problem by hiding the implicit nodes created
automatically by the mirror and commit block jobs in the output of
query-block and BlockBackend-based query-blockstats as long as the user
doesn't indicate that they are aware of those nodes by providing a node
name for them in the QMP command to start the block job.

The node-based commands query-named-block-nodes and query-blockstats
with query-nodes=true still show all nodes, including implicit ones.
This ensures that users that are capable of node-level management can
still access the full information; users that only know BlockBackends
won't use these commands.

Cc: address@hidden
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Peter Krempa <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Tested-by: Eric Blake <address@hidden>


  Commit: 2c93c5cb43fd992038711f84ea34c9373273cda6
      
https://github.com/qemu/qemu/commit/2c93c5cb43fd992038711f84ea34c9373273cda6
  Author: Kevin Wolf <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M tests/qemu-iotests/030
    M tests/qemu-iotests/041
    M tests/qemu-iotests/055
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  qemu-iotests: Avoid unnecessary sleeps

Test cases 030, 041 and 055 used to sleep for a second after calling
block-job-pause to make sure that the block job had time to actually
get into paused state. We can instead poll its status and use that one
second only as a timeout.

The tests also slept a second for checking that the block jobs don't
make progress while being paused. Half a second is more than enough for
this.

These changes reduce the total time for the three tests by 25 seconds on
my laptop (from 155 seconds to 130).

Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 50104f5ac537eecc890c65e99362df47bac3f9d9
      
https://github.com/qemu/qemu/commit/50104f5ac537eecc890c65e99362df47bac3f9d9
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-24 (Mon, 24 Jul 2017)

  Changed paths:
    M block.c
    M block/commit.c
    M block/dirty-bitmap.c
    M block/mirror.c
    M block/qapi.c
    M block/qcow2.c
    M include/block/block.h
    M include/block/block_int.h
    M qapi/block-core.json
    M tests/qemu-iotests/030
    M tests/qemu-iotests/040
    M tests/qemu-iotests/040.out
    M tests/qemu-iotests/041
    M tests/qemu-iotests/041.out
    M tests/qemu-iotests/055
    M tests/qemu-iotests/group
    M tests/qemu-iotests/iotests.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches for 2.10.0-rc0

# gpg: Signature made Mon 24 Jul 2017 15:16:42 BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  qemu-iotests: Avoid unnecessary sleeps
  block: Skip implicit nodes in query-block/blockstats
  qcow2: Fix sector calculation in qcow2_measure()
  dirty-bitmap: Report BlockDirtyInfo.count in bytes, as documented
  iotests: Remove a few tests from 'quick' group

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/ce1d20aac853...50104f5ac537