[Qemu-commits] [qemu/qemu] b13523: iotests: Fix a problem in common.filter

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b135233b0da2b20af4cabc7663e0b65ae896b75f
      
https://github.com/qemu/qemu/commit/b135233b0da2b20af4cabc7663e0b65ae896b75f
  Author: QingFeng Hao <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

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

  Log Message:
  -----------
  iotests: Fix a problem in common.filter

If TEST_DIR is set to /tmp, test case 144 will fail. The reason is that
TEST_DIR resembles 144's test image name tmp.qcow2.
When 144 is testing $TEST_DIR/tmp.qcow2, it wants to replace
$TEST_DIR/tmp.qcow2 to TEST_DIR/tmp.qcow2, but actually it will fail
and get TEST_DIRTEST_DIR.qcow2 in this case.
The fix is just to modify the code to replace $TEST_DIR/ with TEST_DIR/.

Signed-off-by: QingFeng Hao <address@hidden>
Message-id: address@hidden
Reviewed-by: Eric Blake <address@hidden>
[mreitz: Fixed commit message and dropped superfluous escaping]
Signed-off-by: Max Reitz <address@hidden>


  Commit: 6b33f3ae8b79726ef0812597b8a83c3e82d31514
      
https://github.com/qemu/qemu/commit/6b33f3ae8b79726ef0812597b8a83c3e82d31514
  Author: Max Reitz <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Improve commit invalid base message

When trying to invoke qemu-img commit with a base image file name that
is not part of the top image's backing chain, the user receives a rather
plain "Base not found" error message. This is not really helpful because
it does not explain what "not found" means, potentially leaving the user
wondering why qemu cannot find a file despite it clearly existing in the
file system.

Improve the error message by clarifying that "not found" means "not
found in the top image's backing chain".

Reported-by: Ala Hino <address@hidden>
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: 9adceb02133f856fc69bf105848849f409e805b9
      
https://github.com/qemu/qemu/commit/9adceb02133f856fc69bf105848849f409e805b9
  Author: Fam Zheng <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block/qapi.c

  Log Message:
  -----------
  qapi: Tweak error message of bdrv_query_image_info

@bs doesn't always have a device name, such as when it comes from
"qemu-img info". Report file name instead.

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


  Commit: 53b63460f61906340bfe73d263c47896f68f7b9d
      
https://github.com/qemu/qemu/commit/53b63460f61906340bfe73d263c47896f68f7b9d
  Author: Fam Zheng <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

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

  Log Message:
  -----------
  iotests: Fix reference output for 059

It was broken by efaa7c4eeb7 when it dropped the device name "image"
from BB API.  Now this error message text is updated again, sync it up.

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


  Commit: 36bd4228126139a382a4fdbc49c96798a9894626
      
https://github.com/qemu/qemu/commit/36bd4228126139a382a4fdbc49c96798a9894626
  Author: Daniel P. Berrange <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M tests/qemu-iotests/.gitignore
    M tests/qemu-iotests/Makefile
    M tests/qemu-iotests/check

  Log Message:
  -----------
  iotests: record separate timings per format,protocol pair

The 'check' program records timings for each test that
is run. These timings are only valid, however, for a
particular format/protocol combination. So if frequently
running 'check' with a variety of different formats or
protocols, the times printed can be very misleading.

Instead of having a single 'check.time' file, maintain
multiple 'check.time-$IMGPROTO-$IMGFMT' files.

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


  Commit: 4545d4f4af8b29ba3b38dfb74d6f45342e15a62d
      
https://github.com/qemu/qemu/commit/4545d4f4af8b29ba3b38dfb74d6f45342e15a62d
  Author: QingFeng Hao <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  block/vmdk: Fix the endian problem of buf_len and lba

The problem was triggered by qemu-iotests case 055. It failed when it
was comparing the compressed vmdk image with original test.img.

The cause is that buf_len in vmdk_write_extent wasn't converted to
little-endian before it was stored to disk. But later vmdk_read_extent
read it and converted it from little-endian to cpu endian.
If the cpu is big-endian like s390, the problem will happen and
the data length read by vmdk_read_extent will become invalid!
The fix is to add the conversion in vmdk_write_extent, meanwhile,
repair the endianness problem of lba field which shall also be converted
to little-endian before storing to disk.

Cc: address@hidden
Signed-off-by: QingFeng Hao <address@hidden>
Signed-off-by: Jing Liu <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: 418661e0324c1c419552cf24bd4447292e884bdd
      
https://github.com/qemu/qemu/commit/418661e0324c1c419552cf24bd4447292e884bdd
  Author: Jeff Cody <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: check full backing filename when searching protocol filenames

In bdrv_find_backing_image(), if we are searching an image for a backing
file that contains a protocol, we currently only compare unmodified
paths.

However, some management software will change the backing filename to be
a relative filename in a path.  QEMU is able to handle this fine,
because internally it will use path_combine to put together the full
protocol URI.

However, this can lead to an inability to match an image during a QAPI
command that needs to use bdrv_find_backing_image() to find the image,
when it is searched by the full URI.

When searching for a protocol filename, if the straight comparison
fails, this patch will also compare against the full backing filename to
see if that is a match.

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


  Commit: 846a1d118e2e7bce8640452e181c53f902a40dbf
      
https://github.com/qemu/qemu/commit/846a1d118e2e7bce8640452e181c53f902a40dbf
  Author: Jeff Cody <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

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

  Log Message:
  -----------
  qemu-iotests: Don't create fifos / pidfiles with protocol paths

Trying to create, use, and remove fifos and pidfiles on protocol paths
(e.g. nfs://localhost/scratch/qemu-nbd.pid) is obviously broken.

Use the local $TEST_DIR path before it is 'protocolized' for these
files.

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


  Commit: 256e3b6387c91113a39cdfaa5d3b020ccd4b1a33
      
https://github.com/qemu/qemu/commit/256e3b6387c91113a39cdfaa5d3b020ccd4b1a33
  Author: Jeff Cody <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

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

  Log Message:
  -----------
  qemu-iotest: test to lookup protocol-based image with relative backing

This test uses NFS and block-stream to force a lookup of a backing
image that has a relative filename, but a full backing image name
with the protocol path intact.

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


  Commit: 20a6d768f5c1a590d8a42c343aa862f89966cb23
      
https://github.com/qemu/qemu/commit/20a6d768f5c1a590d8a42c343aa862f89966cb23
  Author: Dou Liyang <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block/qapi.c

  Log Message:
  -----------
  block/qapi: reduce the coupling between the bdrv_query_stats and 
bdrv_query_bds_stats

The bdrv_query_stats and bdrv_query_bds_stats functions need to call
each other, that increases the coupling. it also makes the program
complicated and makes some unnecessary tests.

Remove the call from bdrv_query_bds_stats to bdrv_query_stats, just
take some recursion to make it clearly.

Avoid testing whether the blk is NULL during querying the bds stats.
It is unnecessary.

Signed-off-by: Dou Liyang <address@hidden>
Message-id: address@hidden
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: a6baa60807f88ba7d97b1787797fb58882ccbfb9
      
https://github.com/qemu/qemu/commit/a6baa60807f88ba7d97b1787797fb58882ccbfb9
  Author: Dou Liyang <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block/qapi.c

  Log Message:
  -----------
  block/qapi: reduce the execution time of qmp_query_blockstats

In order to reduce the execution time, this patch optimize
the qmp_query_blockstats():
Remove the next_query_bds function.
Remove the bdrv_query_stats function.
Remove some judgement sentence.

The original qmp_query_blockstats calls next_query_bds to get
the next objects in each loops. In the next_query_bds, it checks
the query_nodes and blk. It also call bdrv_query_stats to get
the stats, In the bdrv_query_stats, it checks blk and bs each
times. This waste more times, which may stall the main loop a
bit. And if the disk is too many and donot use the dataplane
feature, this may affect the performance in main loop thread.

This patch removes that two functions, and makes the structure
clearly.

Signed-off-by: Dou Liyang <address@hidden>
Message-id: address@hidden
Reviewed-by: Markus Armbruster <address@hidden>
[mreitz: Removed duplicate info->value assignment]
Signed-off-by: Max Reitz <address@hidden>


  Commit: 16e977d506bcc2d9f7daa4a9f7cc2b48536d9da6
      
https://github.com/qemu/qemu/commit/16e977d506bcc2d9f7daa4a9f7cc2b48536d9da6
  Author: Vladimir Sementsov-Ogievskiy <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: bdrv_invalidate_cache: invalidate children first

Current implementation invalidates firstly parent bds and then its
children. This leads to the following bug:

after incoming migration, in bdrv_invalidate_cache_all:
1. invalidate parent bds - reopen it with BDRV_O_INACTIVE cleared
2. child is not yet invalidated
3. parent check that its BDRV_O_INACTIVE is cleared
4. parent writes to child
5. assert in bdrv_co_pwritev, as BDRV_O_INACTIVE is set for child

This patch fixes it by just changing invalidate sequence: invalidate
children first.

Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 8d20abe87afa735cd0ae6688bd105c7a27390343
      
https://github.com/qemu/qemu/commit/8d20abe87afa735cd0ae6688bd105c7a27390343
  Author: Peter Lieven <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  block/nfs: fix NULL pointer dereference in URI parsing

parse_uint_full wants to put the parsed value into the
variable passed via its second argument which is NULL.

Fixes: 94d6a7a76e9df9919629428f6c598e2b97d9426c
Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>


  Commit: f67409a5bb43ebe74401fa8e187267eb0f139293
      
https://github.com/qemu/qemu/commit/f67409a5bb43ebe74401fa8e187267eb0f139293
  Author: Peter Lieven <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block/nfs.c

  Log Message:
  -----------
  block/nfs: fix naming of runtime opts

commit 94d6a7a accidentally left the naming of runtime opts and QAPI
scheme inconsistent. As one consequence passing of parameters in the
URI is broken. Sync the naming of the runtime opts to the QAPI
scheme.

Please note that this is technically backwards incompatible with the 2.8
release, but the 2.8 release is the only version that had the wrong naming.
Furthermore release 2.8 suffered from a NULL pointer dereference during
URI parsing.

Fixes: 94d6a7a76e9df9919629428f6c598e2b97d9426c
Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Message-id: address@hidden
[mreitz: Fixed commit message]
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: b7aa1315198de1bd2c5f457d2e2c6cd007b3f430
      
https://github.com/qemu/qemu/commit/b7aa1315198de1bd2c5f457d2e2c6cd007b3f430
  Author: Nir Soffer <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M qemu-io.c
    M tests/qemu-iotests/059.out
    M tests/qemu-iotests/070.out
    M tests/qemu-iotests/075.out
    M tests/qemu-iotests/076.out
    M tests/qemu-iotests/078.out
    M tests/qemu-iotests/080.out
    M tests/qemu-iotests/083.out
    M tests/qemu-iotests/088.out
    M tests/qemu-iotests/092.out
    M tests/qemu-iotests/116.out
    M tests/qemu-iotests/131.out
    M tests/qemu-iotests/140.out

  Log Message:
  -----------
  qemu-io: Return non-zero exit code on failure

The result of openfile was not checked, leading to failure deep in the
actual command with confusing error message, and exiting with exit code 0.

Here is a simple example - trying to read with the wrong format:

    $ touch file
    $ qemu-io -f qcow2 -c 'read -P 1 0 1024' file; echo $?
    can't open device file: Image is not in qcow2 format
    no file open, try 'help open'
    0

With this patch, we fail earlier with exit code 1:

    $ ./qemu-io -f qcow2 -c 'read -P 1 0 1024' file; echo $?
    can't open device file: Image is not in qcow2 format
    1

Failing earlier, we don't log this error now:

    no file open, try 'help open'

But some tests expected it; the line was removed from the test output.

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


  Commit: b4a2caa4bd5ad4e3cd6dd7eb1c0067d9205280cb
      
https://github.com/qemu/qemu/commit/b4a2caa4bd5ad4e3cd6dd7eb1c0067d9205280cb
  Author: Nir Soffer <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

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

  Log Message:
  -----------
  qemu-iotests: Add _unsupported_fmt helper

This helper allows adding tests supporting any format expect the
specified formats. This may be useful to test that many formats behave
in a common way.

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


  Commit: bf68bcb18e65e2fc6aaa55079740feee4c8b474c
      
https://github.com/qemu/qemu/commit/bf68bcb18e65e2fc6aaa55079740feee4c8b474c
  Author: Nir Soffer <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

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

  Log Message:
  -----------
  qemu-io: Add failure regression tests

Add regression tests checking that qemu-io fails with non-zero exit code
when reading non-existing file or using the wrong image format.

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


  Commit: 7061a078984ba7d08b8b80686ad98c5162e56fbd
      
https://github.com/qemu/qemu/commit/7061a078984ba7d08b8b80686ad98c5162e56fbd
  Author: Alberto Garcia <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/qcow2.h

  Log Message:
  -----------
  qcow2: Optimize the refcount-block overlap check

The metadata overlap checks introduced in a40f1c2add help detect
corruption in the qcow2 image by verifying that data writes don't
overlap with existing metadata sections.

The 'refcount-block' check in particular iterates over the refcount
table in order to get the addresses of all refcount blocks and check
that none of them overlap with the region where we want to write.

The problem with the refcount table is that since it always occupies
complete clusters its size is usually very big. With the default
values of cluster_size=64KB and refcount_bits=16 this table holds 8192
entries, each one of them enough to map 2GB worth of host clusters.

So unless we're using images with several TB of allocated data this
table is going to be mostly empty, and iterating over it is a waste of
CPU. If the storage backend is fast enough this can have an effect on
I/O performance.

This patch keeps the index of the last used (i.e. non-zero) entry in
the refcount table and updates it every time the table changes. The
refcount-block overlap check then uses that index instead of reading
the whole table.

In my tests with a 4GB qcow2 file stored in RAM this doubles the
amount of write IOPS.

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


  Commit: 3026c4688ca80d9c5cc1606368c4a1009a6f507d
      
https://github.com/qemu/qemu/commit/3026c4688ca80d9c5cc1606368c4a1009a6f507d
  Author: Alberto Garcia <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M qemu-io-cmds.c

  Log Message:
  -----------
  qemu-io: don't allow I/O operations larger than BDRV_REQUEST_MAX_BYTES

Passing a request size larger than BDRV_REQUEST_MAX_BYTES to any of the
I/O commands results in an error. While 'read' and 'write' handle the
error correctly, 'aio_read' and 'aio_write' hit an assertion:

blk_aio_read_entry: Assertion `rwco->qiov->size == acb->bytes' failed.

The reason is that the QEMU I/O code cannot handle request sizes
larger than BDRV_REQUEST_MAX_BYTES, so this patch makes qemu-io check
that all values are within range.

Signed-off-by: Alberto Garcia <address@hidden>
Message-id: address@hidden
[mreitz: Use BDRV_REQUEST_MAX_BYTES instead of INT_MAX]
Signed-off-by: Max Reitz <address@hidden>


  Commit: 8b3c67922851bee9d5420373bfea010d3648bbc4
      
https://github.com/qemu/qemu/commit/8b3c67922851bee9d5420373bfea010d3648bbc4
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Use qemu_strtoul() rather than raw strtoul()

Some of the argument parsing in qemu-img uses strtoul() to parse
integer arguments.  This is tricky to get correct and in fact the
code does not get it right, because it assigns the result of
strtoul() to an 'int' variable and then tries to check for > INT_MAX.
Coverity correctly complains that the comparison is always false.

Rewrite to use qemu_strtoul(), which has a saner convention for
reporting conversion failures.

(Fixes CID 1356421, CID 1356422, CID 1356423.)

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 10d6eda1926804a09aa0710ca62933087813de0b
      
https://github.com/qemu/qemu/commit/10d6eda1926804a09aa0710ca62933087813de0b
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-12 (Sun, 12 Feb 2017)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Avoid setting ret to unused value in img_convert()

Coverity points out that we assign the return value from
bdrv_snapshot_load_tmp() to 'ret' in img_convert(), but then
never use that variable. (We check for failure by looking
at local_err instead.) Drop the unused assignment, bringing
the call into line with the following call to
bdrv_snapshot_laod_tmp_by_id_or_name().

(Fixes CID 1247240.)

Signed-off-by: Peter Maydell <address@hidden>
Message-id: address@hidden
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 0b4384d0bb98f0016ba671b1c9cc75c2f31cd057
      
https://github.com/qemu/qemu/commit/0b4384d0bb98f0016ba671b1c9cc75c2f31cd057
  Author: Peter Maydell <address@hidden>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    M block.c
    M block/nfs.c
    M block/qapi.c
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/qcow2.h
    M block/vmdk.c
    M qemu-img.c
    M qemu-io-cmds.c
    M qemu-io.c
    M tests/qemu-iotests/.gitignore
    M tests/qemu-iotests/059.out
    M tests/qemu-iotests/070.out
    M tests/qemu-iotests/075.out
    M tests/qemu-iotests/076.out
    M tests/qemu-iotests/078.out
    M tests/qemu-iotests/080.out
    M tests/qemu-iotests/083.out
    M tests/qemu-iotests/088.out
    M tests/qemu-iotests/092.out
    M tests/qemu-iotests/116.out
    M tests/qemu-iotests/131.out
    M tests/qemu-iotests/140.out
    A tests/qemu-iotests/173
    A tests/qemu-iotests/173.out
    A tests/qemu-iotests/174
    A tests/qemu-iotests/174.out
    M tests/qemu-iotests/Makefile
    M tests/qemu-iotests/check
    M tests/qemu-iotests/common.config
    M tests/qemu-iotests/common.filter
    M tests/qemu-iotests/common.qemu
    M tests/qemu-iotests/common.rc
    M tests/qemu-iotests/group

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-02-12' 
into staging

Block patches

# gpg: Signature made Sun 12 Feb 2017 01:26:20 GMT
# gpg:                using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <address@hidden>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* remotes/maxreitz/tags/pull-block-2017-02-12: (21 commits)
  qemu-img: Avoid setting ret to unused value in img_convert()
  qemu-img: Use qemu_strtoul() rather than raw strtoul()
  qemu-io: don't allow I/O operations larger than BDRV_REQUEST_MAX_BYTES
  qcow2: Optimize the refcount-block overlap check
  qemu-io: Add failure regression tests
  qemu-iotests: Add _unsupported_fmt helper
  qemu-io: Return non-zero exit code on failure
  block/nfs: fix naming of runtime opts
  block/nfs: fix NULL pointer dereference in URI parsing
  block: bdrv_invalidate_cache: invalidate children first
  block/qapi: reduce the execution time of qmp_query_blockstats
  block/qapi: reduce the coupling between the bdrv_query_stats and 
bdrv_query_bds_stats
  qemu-iotest: test to lookup protocol-based image with relative backing
  qemu-iotests: Don't create fifos / pidfiles with protocol paths
  block: check full backing filename when searching protocol filenames
  block/vmdk: Fix the endian problem of buf_len and lba
  iotests: record separate timings per format,protocol pair
  iotests: Fix reference output for 059
  qapi: Tweak error message of bdrv_query_image_info
  qemu-img: Improve commit invalid base message
  ...

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


Compare: https://github.com/qemu/qemu/compare/ed3d90df7c75...0b4384d0bb98