[Qemu-commits] [qemu/qemu] f86428: osdep: Retry SETLK upon EINTR

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f86428a1f4f91a460ed585682af70d3e8c31dc06
      
https://github.com/qemu/qemu/commit/f86428a1f4f91a460ed585682af70d3e8c31dc06
  Author: Fam Zheng <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M util/osdep.c

  Log Message:
  -----------
  osdep: Retry SETLK upon EINTR

We could hit lock failure if there is a signal that makes fcntl return
-1 and errno set to EINTR. In this case we should retry.

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


  Commit: 5e9aa92eb1a5abbb6e0e3dafdf64ac728e11b6f2
      
https://github.com/qemu/qemu/commit/5e9aa92eb1a5abbb6e0e3dafdf64ac728e11b6f2
  Author: Hikaru Nishida <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M hw/block/nvme.c
    M hw/block/nvme.h

  Log Message:
  -----------
  hw/block: Fix pin-based interrupt behaviour of NVMe

Pin-based interrupt of NVMe controller did not work properly
because using an obsolated function pci_irq_pulse().
To fix this, change to use pci_irq_assert() / pci_irq_deassert()
instead of pci_irq_pulse().

Signed-off-by: Hikaru Nishida <address@hidden>
Reviewed-by: Keith Busch <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a30306ed620e689ddba0dadbf8ffe7acadfd325a
      
https://github.com/qemu/qemu/commit/a30306ed620e689ddba0dadbf8ffe7acadfd325a
  Author: Kevin Wolf <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/.gitignore

  Log Message:
  -----------
  tests/.gitignore: Add test-bdrv-drain

Commit 881cfd17 added a new test binary, include it in .gitignore.

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


  Commit: 7c3a3028596db5e142c6fc9644800a0ec3b073fd
      
https://github.com/qemu/qemu/commit/7c3a3028596db5e142c6fc9644800a0ec3b073fd
  Author: Daniel Henrique Barboza <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    A tests/qemu-iotests/201
    A tests/qemu-iotests/201.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  tests/qemu-iotests: adding savevm/loadvm with postcopy flag test

This patch implements a test case for the scenario that was failing
prior to the patch "migration/ram.c: do not set 'postcopy_running' in
POSTCOPY_INCOMING_END", commit acab30b85d.

This new test file 201 was derived from the test file 181 authored
by Kevin Wolf.

CC: Kevin Wolf <address@hidden>
CC: Max Reitz <address@hidden>
CC: Cleber Rosa <address@hidden>
Signed-off-by: Daniel Henrique Barboza <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: ac5b787a6ee57852021e4a5a6876759218fbbbb0
      
https://github.com/qemu/qemu/commit/ac5b787a6ee57852021e4a5a6876759218fbbbb0
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  qcow2: Repair unaligned preallocated zero clusters

We can easily repair unaligned preallocated zero clusters by discarding
them, so why not do it?

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 1d701e0e7e3cdae803481216f572b8e4263d2b42
      
https://github.com/qemu/qemu/commit/1d701e0e7e3cdae803481216f572b8e4263d2b42
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/qemu-iotests/118
    M tests/qemu-iotests/155

  Log Message:
  -----------
  iotests: Make BD-{remove,insert}-medium use @id

In some cases, these commands still use the deprecated @device
parameter.  Fix that so we can later drop that parameter from their
interface.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: f6c3dc136fe2b215cb2c6c5ff4a2c1faa1871640
      
https://github.com/qemu/qemu/commit/f6c3dc136fe2b215cb2c6c5ff4a2c1faa1871640
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/ahci-test.c

  Log Message:
  -----------
  tests/ahci: Switch tray and medium commands to @id

Currently, the tray and medium commands in the AHCI test use the
deprecated @device parameter.  This patch switches all invocations over
to use @id.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 82fcf66e052d6dae834255a814969c67e13b6791
      
https://github.com/qemu/qemu/commit/82fcf66e052d6dae834255a814969c67e13b6791
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M blockdev.c
    M qapi/block-core.json

  Log Message:
  -----------
  blockdev: Drop BD-{remove,insert}-medium's @device

This is an incompatible change, which is fine as the commands are
experimental.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 34ce1111416986e62fbb6d55e0a7d45bbb9802ce
      
https://github.com/qemu/qemu/commit/34ce1111416986e62fbb6d55e0a7d45bbb9802ce
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M blockdev.c
    M qapi/block-core.json
    M tests/ahci-test.c
    M tests/qemu-iotests/093
    M tests/qemu-iotests/118
    M tests/qemu-iotests/139

  Log Message:
  -----------
  blockdev: Mark BD-{remove,insert}-medium stable

Now that iotest 093 test proves that the throttling configuration
survives a blockdev-remove-medium/blockdev-insert-medium pair, the
original reason for declaring these commands experimental is gone
(see commit 6e0abc251dd4f8eba1f53656dfede12e5840e83b).

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 6bfc907deed83af7c2df371ffa3508427c6de52f
      
https://github.com/qemu/qemu/commit/6bfc907deed83af7c2df371ffa3508427c6de52f
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  qemu-iotests: Fix locking issue in 102

102 truncates a qcow2 file (the raw file) on purpose while a VM is
running.  However, image locking will usually prevent exactly this.

The fact that most people have not noticed until now (I suppose you may
have seen sporadic failures, but not taken them too seriously, like me)
further shows that this truncation is actually not really done
concurrently, but that the VM is still starting up by this point and has
not yet opened the image.  Remedy this by waiting for the monitor shell
to appear before the qemu-img invocation so we know the VM is up.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 3c363575dc5fe325a8b16b1a18e1fa48120df6b6
      
https://github.com/qemu/qemu/commit/3c363575dc5fe325a8b16b1a18e1fa48120df6b6
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  block/vmdk: Fix , instead of ; at end of line

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: c9ceb3ec8a7e6dc4f74183ca7493895445b57845
      
https://github.com/qemu/qemu/commit/c9ceb3ec8a7e6dc4f74183ca7493895445b57845
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M block/qcow2-bitmap.c
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: No persistent dirty bitmaps for compat=0.10

Persistent dirty bitmaps require a properly functioning
autoclear_features field, or we cannot track when an unsupporting
program might overwrite them.  Therefore, we cannot support them for
compat=0.10 images.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 0abb1475f86eccee122bb0718b368db77b222a21
      
https://github.com/qemu/qemu/commit/0abb1475f86eccee122bb0718b368db77b222a21
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M block/qcow.c

  Log Message:
  -----------
  block/qcow: Add blkdebug events

This is not necessarily complete, but it should include the most
important places.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 23c4b2a8967c59c801e665843e207dbfe1634952
      
https://github.com/qemu/qemu/commit/23c4b2a8967c59c801e665843e207dbfe1634952
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  block/vmdk: Add blkdebug events

This is certainly not complete, but it includes at least write_aio and
read_aio.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 6dd6d7abf0a68a1e6639572ec09f69a9e0558207
      
https://github.com/qemu/qemu/commit/6dd6d7abf0a68a1e6639572ec09f69a9e0558207
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/qemu-iotests/common.rc

  Log Message:
  -----------
  iotests: Fix _img_info for backslashes

read without -r eats backslashes.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 1cc6169bb23704a55cee59a2a7d890f109ecc4be
      
https://github.com/qemu/qemu/commit/1cc6169bb23704a55cee59a2a7d890f109ecc4be
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/qemu-iotests/198
    M tests/qemu-iotests/common.filter

  Log Message:
  -----------
  iotests: Drop format-specific in _filter_img_info

_filter_img_info should remove format-specific information, too.  We
already have such a filter in _img_info, and it is very useful for
query-block-named-block-nodes (etc.), too.

However, in 198 we need that information (but we still want the rest of
the filter), so make that filtering optional.  Note that "the rest of
the filter" includes filtering of the test directory, so we can drop the
_filter_testdir from 198 at the same time.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 8e5decb521b62e553b6d1a0b37a8491f24ab645c
      
https://github.com/qemu/qemu/commit/8e5decb521b62e553b6d1a0b37a8491f24ab645c
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/qemu-iotests/020

  Log Message:
  -----------
  iotests: Forbid 020 for non-file protocols

This test does funny things like TEST_IMG="TEST_IMG.base" _make_test_img
that usually only work with the file protocol.  More specifically, they
do not work with the most interesting non-file protocols, so we might as
well skip this for anything but file.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: a03a57a0f9ff4cc405ca7644d965154afe1ac51e
      
https://github.com/qemu/qemu/commit/a03a57a0f9ff4cc405ca7644d965154afe1ac51e
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/qemu-iotests/103

  Log Message:
  -----------
  iotests: Skip 103 for refcount_bits=1

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 8c97fcf4fe2e1d2bfe79053a5c3275c1c205ac28
      
https://github.com/qemu/qemu/commit/8c97fcf4fe2e1d2bfe79053a5c3275c1c205ac28
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  iotests: Fix 020 for vmdk

vmdk cannot work with anything but vmdk backing files, so make the
backing file be the same format as the overlay.

Reported-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 7e0db6f442d58372067bee13c90174568177af65
      
https://github.com/qemu/qemu/commit/7e0db6f442d58372067bee13c90174568177af65
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  iotests: Fix 051 for compat=0.10

051 has both compat=1.1 and compat=0.10 tests (once it uses
lazy_refcounts, once it tests that setting them does not work).
For the compat=0.10 tests, it already explicitly creates a suitable
image.  So let's just ignore the user-specified compat level for the
lazy_refcounts test and explicitly create a compat=1.1 image there, too.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 76bf133c438f427de7fd07f819d801aa1a4d38fd
      
https://github.com/qemu/qemu/commit/76bf133c438f427de7fd07f819d801aa1a4d38fd
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  iotests: Fix 059's reference output

As of commit 9877860e7bd1e26ee70ab9bb5ebc34c92bf23bf5, vmdk fails
differently when opening the sample image.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: e121034d1442231eaded4213f442fc14b6d553d7
      
https://github.com/qemu/qemu/commit/e121034d1442231eaded4213f442fc14b6d553d7
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  iotests: Fix 067 for compat=0.10

067 works very well with compat=0.10 once you remove format-specific
information from the QMP output.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 9853f5c4961ed416196a3af208d8c219df0e05ed
      
https://github.com/qemu/qemu/commit/9853f5c4961ed416196a3af208d8c219df0e05ed
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  iotests: Make 089 compatible with compat=0.10

The only thing that is missing is a _filter_img_info after the
"$QEMU_IO -c info" invocations.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: b5d92efa085daf5554719825f1c09626299eaa15
      
https://github.com/qemu/qemu/commit/b5d92efa085daf5554719825f1c09626299eaa15
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  iotests: Make 184 image-less

184 does not need an image, so don't use one.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 2483537ed9839ac2aa5450985983333c4c8771cd
      
https://github.com/qemu/qemu/commit/2483537ed9839ac2aa5450985983333c4c8771cd
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  iotests: Make 191 work with qcow2 options

In order for 191 to work with an explicit refcount_bits or compat=0.10,
we should strip format-specific information from the output--and we can
do so by using _filter_img_info.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: b01a1944e534857cc72c86222189f55191ded44e
      
https://github.com/qemu/qemu/commit/b01a1944e534857cc72c86222189f55191ded44e
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

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

  Log Message:
  -----------
  iotests: Filter compat-dependent info in 198

There is a bit of image-specific information which depends on the qcow2
compat level.  Filter it so that 198 works with compat=0.10 (and any
refcount_bits value).

Note that we cannot simply drop the --format-specific switch because we
do need the "encrypt" information.

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 2291712c39111a73244c93beb6612394e98366d9
      
https://github.com/qemu/qemu/commit/2291712c39111a73244c93beb6612394e98366d9
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/qemu-iotests/059

  Log Message:
  -----------
  iotests: Make 059 pass on machines with little RAM

Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: d6ac6e93632e9196592199a5bcda957c06a8bf64
      
https://github.com/qemu/qemu/commit/d6ac6e93632e9196592199a5bcda957c06a8bf64
  Author: Eric Blake <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/qemu-iotests/177
    M tests/qemu-iotests/177.out
    A tests/qemu-iotests/204
    A tests/qemu-iotests/204.out
    M tests/qemu-iotests/group

  Log Message:
  -----------
  iotests: Split 177 into two parts for compat=0.10

When originally written, test 177 explicitly took care to run
with compat=0.10.  Then I botched my own test in commit
81c219ac and f0a9c18f, by adding additional actions that require
v3 images.  Split out the new code into a new v3-only test, 204,
and revert 177 back to its original state other than a new comment.

Reported-by: Max Reitz <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 94254c9b1166288c943ab3c2eed81d6cb4e6d187
      
https://github.com/qemu/qemu/commit/94254c9b1166288c943ab3c2eed81d6cb4e6d187
  Author: Max Reitz <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M tests/qemu-iotests/080
    M tests/qemu-iotests/130
    M tests/qemu-iotests/137
    M tests/qemu-iotests/176

  Log Message:
  -----------
  iotests: Disable some tests for compat=0.10

Tests 080, 130, 137, and 176 simply do not work with compat=0.10 for the
reasons stated there.

Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
[eblake: fix 177 in a separate commit]
Signed-off-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 8c0c5e636e6b11eaf0556be31fceb68e0baff310
      
https://github.com/qemu/qemu/commit/8c0c5e636e6b11eaf0556be31fceb68e0baff310
  Author: Kevin Wolf <address@hidden>
  Date:   2018-01-23 (Tue, 23 Jan 2018)

  Changed paths:
    M block/qcow.c
    M block/qcow2-bitmap.c
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/vmdk.c
    M blockdev.c
    M qapi/block-core.json
    M tests/ahci-test.c
    M tests/qemu-iotests/020
    M tests/qemu-iotests/020.out
    M tests/qemu-iotests/051
    M tests/qemu-iotests/051.out
    M tests/qemu-iotests/051.pc.out
    M tests/qemu-iotests/059
    M tests/qemu-iotests/059.out
    M tests/qemu-iotests/060
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/067
    M tests/qemu-iotests/067.out
    M tests/qemu-iotests/080
    M tests/qemu-iotests/089
    M tests/qemu-iotests/089.out
    M tests/qemu-iotests/093
    M tests/qemu-iotests/102
    M tests/qemu-iotests/102.out
    M tests/qemu-iotests/103
    M tests/qemu-iotests/118
    M tests/qemu-iotests/130
    M tests/qemu-iotests/137
    M tests/qemu-iotests/139
    M tests/qemu-iotests/155
    M tests/qemu-iotests/176
    M tests/qemu-iotests/177
    M tests/qemu-iotests/177.out
    M tests/qemu-iotests/184
    M tests/qemu-iotests/184.out
    M tests/qemu-iotests/191
    M tests/qemu-iotests/191.out
    M tests/qemu-iotests/198
    M tests/qemu-iotests/198.out
    A tests/qemu-iotests/204
    A tests/qemu-iotests/204.out
    M tests/qemu-iotests/common.filter
    M tests/qemu-iotests/common.rc
    M tests/qemu-iotests/group

  Log Message:
  -----------
  Merge remote-tracking branch 'mreitz/tags/pull-block-2018-01-23' into 
queue-block

Block patches

# gpg: Signature made Tue Jan 23 12:35:11 2018 CET
# gpg:                using RSA key F407DB0061D5CF40
# gpg: Good signature from "Max Reitz <address@hidden>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* mreitz/tags/pull-block-2018-01-23: (25 commits)
  iotests: Disable some tests for compat=0.10
  iotests: Split 177 into two parts for compat=0.10
  iotests: Make 059 pass on machines with little RAM
  iotests: Filter compat-dependent info in 198
  iotests: Make 191 work with qcow2 options
  iotests: Make 184 image-less
  iotests: Make 089 compatible with compat=0.10
  iotests: Fix 067 for compat=0.10
  iotests: Fix 059's reference output
  iotests: Fix 051 for compat=0.10
  iotests: Fix 020 for vmdk
  iotests: Skip 103 for refcount_bits=1
  iotests: Forbid 020 for non-file protocols
  iotests: Drop format-specific in _filter_img_info
  iotests: Fix _img_info for backslashes
  block/vmdk: Add blkdebug events
  block/qcow: Add blkdebug events
  qcow2: No persistent dirty bitmaps for compat=0.10
  block/vmdk: Fix , instead of ; at end of line
  qemu-iotests: Fix locking issue in 102
  ...

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


  Commit: f78b6f9b1161fb67f3ac54e73f7f37464cbff76f
      
https://github.com/qemu/qemu/commit/f78b6f9b1161fb67f3ac54e73f7f37464cbff76f
  Author: Peter Maydell <address@hidden>
  Date:   2018-01-24 (Wed, 24 Jan 2018)

  Changed paths:
    M block/qcow.c
    M block/qcow2-bitmap.c
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/vmdk.c
    M blockdev.c
    M hw/block/nvme.c
    M hw/block/nvme.h
    M qapi/block-core.json
    M tests/.gitignore
    M tests/ahci-test.c
    M tests/qemu-iotests/020
    M tests/qemu-iotests/020.out
    M tests/qemu-iotests/051
    M tests/qemu-iotests/051.out
    M tests/qemu-iotests/051.pc.out
    M tests/qemu-iotests/059
    M tests/qemu-iotests/059.out
    M tests/qemu-iotests/060
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/067
    M tests/qemu-iotests/067.out
    M tests/qemu-iotests/080
    M tests/qemu-iotests/089
    M tests/qemu-iotests/089.out
    M tests/qemu-iotests/093
    M tests/qemu-iotests/102
    M tests/qemu-iotests/102.out
    M tests/qemu-iotests/103
    M tests/qemu-iotests/118
    M tests/qemu-iotests/130
    M tests/qemu-iotests/137
    M tests/qemu-iotests/139
    M tests/qemu-iotests/155
    M tests/qemu-iotests/176
    M tests/qemu-iotests/177
    M tests/qemu-iotests/177.out
    M tests/qemu-iotests/184
    M tests/qemu-iotests/184.out
    M tests/qemu-iotests/191
    M tests/qemu-iotests/191.out
    M tests/qemu-iotests/198
    M tests/qemu-iotests/198.out
    A tests/qemu-iotests/201
    A tests/qemu-iotests/201.out
    A tests/qemu-iotests/204
    A tests/qemu-iotests/204.out
    M tests/qemu-iotests/common.filter
    M tests/qemu-iotests/common.rc
    M tests/qemu-iotests/group
    M util/osdep.c

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

Block layer patches

# gpg: Signature made Tue 23 Jan 2018 12:38:36 GMT
# 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: (29 commits)
  iotests: Disable some tests for compat=0.10
  iotests: Split 177 into two parts for compat=0.10
  iotests: Make 059 pass on machines with little RAM
  iotests: Filter compat-dependent info in 198
  iotests: Make 191 work with qcow2 options
  iotests: Make 184 image-less
  iotests: Make 089 compatible with compat=0.10
  iotests: Fix 067 for compat=0.10
  iotests: Fix 059's reference output
  iotests: Fix 051 for compat=0.10
  iotests: Fix 020 for vmdk
  iotests: Skip 103 for refcount_bits=1
  iotests: Forbid 020 for non-file protocols
  iotests: Drop format-specific in _filter_img_info
  iotests: Fix _img_info for backslashes
  block/vmdk: Add blkdebug events
  block/qcow: Add blkdebug events
  qcow2: No persistent dirty bitmaps for compat=0.10
  block/vmdk: Fix , instead of ; at end of line
  qemu-iotests: Fix locking issue in 102
  ...

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


Compare: https://github.com/qemu/qemu/compare/834a336eb911...f78b6f9b1161