[Qemu-commits] [qemu/qemu] 558939: MAINTAINERS: add aio to block layer

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 558939c6c7e06ef4610906e04bc9a39619e6f1df
      
https://github.com/qemu/qemu/commit/558939c6c7e06ef4610906e04bc9a39619e6f1df
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: add aio to block layer

AioContext falls under the block layer, mark it as such.

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


  Commit: 292420918d4500624c096900f7834d25b23f1ad5
      
https://github.com/qemu/qemu/commit/292420918d4500624c096900f7834d25b23f1ad5
  Author: Kevin Wolf <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: qemu-iotests belongs to the block layer

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


  Commit: 8113fb529282897892f8010ed679565b0f1488d9
      
https://github.com/qemu/qemu/commit/8113fb529282897892f8010ed679565b0f1488d9
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: add the image fuzzer to the block layer

More work for the block device maintainers!

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


  Commit: e9082e47364ac63922ea967aa5d82dbc8ac39960
      
https://github.com/qemu/qemu/commit/e9082e47364ac63922ea967aa5d82dbc8ac39960
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/vdi.c

  Log Message:
  -----------
  block/vdi: Use {DIV_,}ROUND_UP

There are macros for these operations, so make use of them.

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


  Commit: c5f7c0af473cadb8b0b5fc6d399e4ede1fc9408d
      
https://github.com/qemu/qemu/commit/c5f7c0af473cadb8b0b5fc6d399e4ede1fc9408d
  Author: Peter Lieven <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M tests/qemu-iotests/075
    M tests/qemu-iotests/076
    M tests/qemu-iotests/078
    M tests/qemu-iotests/079
    M tests/qemu-iotests/080
    M tests/qemu-iotests/081
    M tests/qemu-iotests/082
    M tests/qemu-iotests/084
    M tests/qemu-iotests/086
    M tests/qemu-iotests/088
    M tests/qemu-iotests/090
    M tests/qemu-iotests/092
    M tests/qemu-iotests/103

  Log Message:
  -----------
  block: qemu-iotests change _supported_proto to file once more.

In preparation to possible automatic regression and performance
testing for the block layer I found that the iotests don't work
for all protocols anymore.

In commit 1f7bf7d0 I started to change supported protocols from
generic to file for various tests. Unfortunately, some tests
added in the meantime again carry generic protocol altough they
can only work with file because they require local file access.

The other way around for some tests that only support file I added
NFS protocol after confirming they work.

Signed-off-by: Peter Lieven <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 9ebd84480583bb6d9a7666c079d99ff3266c423d
      
https://github.com/qemu/qemu/commit/9ebd84480583bb6d9a7666c079d99ff3266c423d
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block.c
    M include/block/block.h

  Log Message:
  -----------
  block: Add qemu_{,try_}blockalign0()

These functions call their non-0-counterparts and then fill the
allocated buffer with 0 (if the allocation has been successful).

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


  Commit: 1d13d654666a7fd6d6a85a0ce9285dbf0d0444c2
      
https://github.com/qemu/qemu/commit/1d13d654666a7fd6d6a85a0ce9285dbf0d0444c2
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

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

  Log Message:
  -----------
  qcow2: Calculate refcount block entry count

The size of a refblock entry is (in theory) variable; calculate
therefore the number of entries per refblock and the according bit shift
(1 << x == entry count) when opening an image.

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


  Commit: 5b84106bd91bc67519738042c8890a09e2967513
      
https://github.com/qemu/qemu/commit/5b84106bd91bc67519738042c8890a09e2967513
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2.c

  Log Message:
  -----------
  qcow2: Fix leaks in dirty images

When opening dirty images, qcow2's repair function should not only
repair errors but leaks as well.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 6ca56bf5e90aa167395727667d17c699950c545c
      
https://github.com/qemu/qemu/commit/6ca56bf5e90aa167395727667d17c699950c545c
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Split qcow2_check_refcounts()

Put the code for calculating the reference counts and comparing them
during qemu-img check into own functions.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 78fb328e854542d79bebe54f3a426cba6d46dbf1
      
https://github.com/qemu/qemu/commit/78fb328e854542d79bebe54f3a426cba6d46dbf1
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Use sizeof(**refcount_table)

When implementing variable refcounts, we want to be able to easily find
all the places in qemu which are tied to a certain refcount order.
Replace sizeof(uint16_t) in the check code by sizeof(**refcount_table)
so we can later find it more easily.

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


  Commit: 057a3fe57e740e5e1cc3d62c9b8e0085e9fffa74
      
https://github.com/qemu/qemu/commit/057a3fe57e740e5e1cc3d62c9b8e0085e9fffa74
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Pull check_refblocks() up

Pull check_refblocks() before calculate_refcounts() so we can drop its
static declaration.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 713d9675e0e31c627d08b6a33d3a92e4b8505b40
      
https://github.com/qemu/qemu/commit/713d9675e0e31c627d08b6a33d3a92e4b8505b40
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Use int64_t for in-memory reftable size

Use int64_t for the entry count of the in-memory refcount table
throughout the check functions.

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


  Commit: ad27390c85c50df402c7ec0d3864fc43e6559fb3
      
https://github.com/qemu/qemu/commit/ad27390c85c50df402c7ec0d3864fc43e6559fb3
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Split fail code in L1 and L2 checks

Instead of printing out an error message, incrementing check_errors and
returning a fixed -errno, just do cleanups and return -ret, with ret set
by the code which threw the exception (jumped to the fail label).

Also, increment check_errors on error in check_refcounts_l2().

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


  Commit: fef4d3d5644f984e9fa427dea4f7cfa15de9059c
      
https://github.com/qemu/qemu/commit/fef4d3d5644f984e9fa427dea4f7cfa15de9059c
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Let inc_refcounts() return -errno

As of a future patch, inc_refcounts() will have to throw errors which
are generally signaled by returning -errno. Therefore, let it return an
integer which is either 0 for success or -errno and handle the -errno
case in all callers.

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


  Commit: 641bb63cd6b003ab0ca2e312a014449037d71647
      
https://github.com/qemu/qemu/commit/641bb63cd6b003ab0ca2e312a014449037d71647
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Let inc_refcounts() resize the reftable

Now that the refcount table can be passed around by reference, do that
for inc_refcounts() (and subsequently check_refcounts_l1() and
check_refcounts_l2()) and use it for resizing it when a cluster after
the image end is encountered.

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


  Commit: 9696df219a71c6608f058ade8873d6d0b4e352fe
      
https://github.com/qemu/qemu/commit/9696df219a71c6608f058ade8873d6d0b4e352fe
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Reuse refcount table in calculate_refcounts()

We will later call calculate_refcounts multiple times, so reuse the
refcount table if possible.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 001c158defb65e88e6c50c85d6f20501f7149ddd
      
https://github.com/qemu/qemu/commit/001c158defb65e88e6c50c85d6f20501f7149ddd
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Fix refcount blocks beyond image end

If the qcow2 check function detects a refcount block located beyond the
image end, grow the image appropriately. This cannot break anything and
is the logical fix for such a case.

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


  Commit: f307b2558f61e068ce514f2dde2cad74c62036d6
      
https://github.com/qemu/qemu/commit/f307b2558f61e068ce514f2dde2cad74c62036d6
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Do not perform potentially damaging repairs

If a referenced cluster has a refcount of 0, increasing its refcount may
result in clusters being allocated for the refcount structures. This may
overwrite the referenced cluster, therefore we cannot simply increase
the refcount then.

In such cases, we can either try to replicate all the refcount
operations solely for the check operation, basing the allocations on the
in-memory refcount table; or we can simply rebuild the whole refcount
structure based on the in-memory refcount table. Since the latter will
be much easier, do that.

To prepare for this, introduce a "rebuild" boolean which should be set
to true whenever a fix is rather dangerous or too complicated using the
current refcount structures. Another example for this is refcount blocks
being referenced more than once.

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


  Commit: c7c0681bc8a781e0319b7cf969b904dfe50d083e
      
https://github.com/qemu/qemu/commit/c7c0681bc8a781e0319b7cf969b904dfe50d083e
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Rebuild refcount structure during check

The previous commit introduced the "rebuild" variable to qcow2's
implementation of the image consistency check. Now make use of this by
adding a function which creates a completely new refcount structure
based solely on the in-memory information gathered before.

The old refcount structure will be leaked, however. This leak will be
dealt with in a follow-up commit.

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


  Commit: 791230d8bbd5c09d80845755a54074cd2d8b5a22
      
https://github.com/qemu/qemu/commit/791230d8bbd5c09d80845755a54074cd2d8b5a22
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-refcount.c

  Log Message:
  -----------
  qcow2: Clean up after refcount rebuild

Because the old refcount structure will be leaked after having rebuilt
it, we need to recalculate the refcounts and run a leak-fixing operation
afterwards (if leaks should be fixed at all).

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


  Commit: d26e6ec052b8768ab45654dbf35d5213818a2cb8
      
https://github.com/qemu/qemu/commit/d26e6ec052b8768ab45654dbf35d5213818a2cb8
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M tests/qemu-iotests/039.out
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/061.out

  Log Message:
  -----------
  iotests: Fix test outputs

039, 060 and 061 all create images with referenced clusters having a
refcount of 0. Because previous commits changed handling of such errors,
these tests now have a different output. Fix it.

Furthermore, 060 created a refblock with a refcount greater than one
which now results in having to rebuild the refcount structure as well.

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


  Commit: 234764eed1aab56a657a161e9a0c65730442e6f8
      
https://github.com/qemu/qemu/commit/234764eed1aab56a657a161e9a0c65730442e6f8
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

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

  Log Message:
  -----------
  iotests: Add test for potentially damaging repairs

There are certain cases where repairing a qcow2 image might actually
damage it further (or rather, where repairing it has in fact damaged it
further with the old qcow2 check implementation). This should not
happen, so add a test for these cases.

Furthermore, the repair function now repairs refblocks beyond the image
end by resizing the image accordingly. Add several tests for this as
well.

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


  Commit: 17bd5f472754acd2458b53dc02a30d5651e6dd79
      
https://github.com/qemu/qemu/commit/17bd5f472754acd2458b53dc02a30d5651e6dd79
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

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

  Log Message:
  -----------
  qcow2: Drop REFCOUNT_SHIFT

With BDRVQcowState.refcount_block_bits, we don't need REFCOUNT_SHIFT
anymore.

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


  Commit: 4b318d6ca66545e59eafbf595f66e31bf1625d9a
      
https://github.com/qemu/qemu/commit/4b318d6ca66545e59eafbf595f66e31bf1625d9a
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M docs/specs/qcow2.txt

  Log Message:
  -----------
  docs/qcow2: Correct refcount_block_entries

A refblock entry may have a different size than 16 bits, it may even be
smaller than a byte. Correct the refcount_block_entries calculation
accordingly.

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


  Commit: 7f75a07d50710e7f1371c4b248e0550549f77ead
      
https://github.com/qemu/qemu/commit/7f75a07d50710e7f1371c4b248e0550549f77ead
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M docs/specs/qcow2.txt

  Log Message:
  -----------
  docs/qcow2: Limit refcount_order to [0, 6]

Specify the upper limit of refcount_order to be 6 (that is,
refcount_bits = 64). Any larger value does not make much sense when all
offsets, sizes, cluster counts etc. "only" have a width of 64 bit as
well, and very large values would be very difficult to support.
Therefore, just cap it at the largest reasonable value.

Suggested-by: Eric Blake <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 59c9a95fd29cfb3296ee58e8a446df251d14a459
      
https://github.com/qemu/qemu/commit/59c9a95fd29cfb3296ee58e8a446df251d14a459
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Respect underlying file's EOF

When falling through to the underlying file in
bdrv_co_get_block_status(), if it returns that the query offset is
beyond the file end (by setting *pnum to 0), return the range to be
zero and do not let the number of sectors for which information could be
obtained be overwritten.

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


  Commit: 4b25bbc4c22cf39350b75bd250d568a4d975f7c5
      
https://github.com/qemu/qemu/commit/4b25bbc4c22cf39350b75bd250d568a4d975f7c5
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M qemu-io-cmds.c

  Log Message:
  -----------
  qemu-io: Respect early image end for map

bdrv_is_allocated() may report zero clusters which most probably means
the image (file) is shorter than expected. Respect this case in order to
avoid an infinite loop.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoît Canet <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 925bb3238d498172e8ee9a57842320b1d1bfc3a5
      
https://github.com/qemu/qemu/commit/925bb3238d498172e8ee9a57842320b1d1bfc3a5
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

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

  Log Message:
  -----------
  iotests: Add test for map commands

Add a test for qemu-img map and qemu-io -c map on truncated files.

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


  Commit: a1391444fe1cfef14976458f3293a2c6945e725c
      
https://github.com/qemu/qemu/commit/a1391444fe1cfef14976458f3293a2c6945e725c
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/qcow2-cluster.c

  Log Message:
  -----------
  qcow2: Do not overflow when writing an L1 sector

While writing an L1 table sector, qcow2_write_l1_entry() copies the
respective range from s->l1_table to the local "buf" array. The size of
s->l1_table does not have to be a multiple of L1_ENTRIES_PER_SECTOR;
thus, limit the index which is used for copying all entries to the L1
size.

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


  Commit: 1b2dd0bee6bd03045b90c8a7549c8134466b2938
      
https://github.com/qemu/qemu/commit/1b2dd0bee6bd03045b90c8a7549c8134466b2938
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

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

  Log Message:
  -----------
  iotests: Add test for qcow2 L1 table update

Updating the L1 table should not result in random data being written.
This adds a test for that.

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


  Commit: 3cad83075c7b847fe0eb6e61316fdf50984d4570
      
https://github.com/qemu/qemu/commit/3cad83075c7b847fe0eb6e61316fdf50984d4570
  Author: Roger Pau Monne <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/raw-posix.c

  Log Message:
  -----------
  block: char devices on FreeBSD are not behind a pager

Introduce a new flag to mark devices that require requests to be aligned and
replace the usage of BDRV_O_NOCACHE and O_DIRECT with this flag when
appropriate.

If a character device is used as a backend on a FreeBSD host set this flag
unconditionally.

Signed-off-by: Roger Pau Monné <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Max Reitz <address@hidden>


  Commit: 832390a5ed11e6c516db0986bf302d098e3ae36c
      
https://github.com/qemu/qemu/commit/832390a5ed11e6c516db0986bf302d098e3ae36c
  Author: Max Reitz <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M qemu-img.c

  Log Message:
  -----------
  qemu-img: Print error if check failed

Currently, if bdrv_check() fails either by returning -errno or having
check_errors set, qemu-img check just exits with 1 after having told the
user that there were no errors on the image. This is bad.

Instead of printing the check result if there were internal errors which
were so bad that bdrv_check() could not even complete with 0 as a return
value, qemu-img check should inform the user about the error.

Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>


  Commit: d4db399b8be286fe471bbc9edf8ec22d8feac4d4
      
https://github.com/qemu/qemu/commit/d4db399b8be286fe471bbc9edf8ec22d8feac4d4
  Author: Kevin Wolf <address@hidden>
  Date:   2014-10-23 (Thu, 23 Oct 2014)

  Changed paths:
    M block/raw-posix.c
    M qemu-img.c

  Log Message:
  -----------
  Merge remote-tracking branch 'mreitz/block' into queue-block

* mreitz/block:
  qemu-img: Print error if check failed
  block: char devices on FreeBSD are not behind a pager


  Commit: 8b135a288ae8dec2359e9bd410312039da2e7cd2
      
https://github.com/qemu/qemu/commit/8b135a288ae8dec2359e9bd410312039da2e7cd2
  Author: Peter Maydell <address@hidden>
  Date:   2014-10-24 (Fri, 24 Oct 2014)

  Changed paths:
    M MAINTAINERS
    M block.c
    M block/qcow2-cluster.c
    M block/qcow2-refcount.c
    M block/qcow2.c
    M block/qcow2.h
    M block/raw-posix.c
    M block/vdi.c
    M docs/specs/qcow2.txt
    M include/block/block.h
    M qemu-img.c
    M qemu-io-cmds.c
    M tests/qemu-iotests/039.out
    M tests/qemu-iotests/060.out
    M tests/qemu-iotests/061.out
    M tests/qemu-iotests/075
    M tests/qemu-iotests/076
    M tests/qemu-iotests/078
    M tests/qemu-iotests/079
    M tests/qemu-iotests/080
    M tests/qemu-iotests/081
    M tests/qemu-iotests/082
    M tests/qemu-iotests/084
    M tests/qemu-iotests/086
    M tests/qemu-iotests/088
    M tests/qemu-iotests/090
    M tests/qemu-iotests/092
    A tests/qemu-iotests/102
    A tests/qemu-iotests/102.out
    M tests/qemu-iotests/103
    A tests/qemu-iotests/107
    A tests/qemu-iotests/107.out
    A tests/qemu-iotests/108
    A tests/qemu-iotests/108.out
    M tests/qemu-iotests/group

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

Block patches

# gpg: Signature made Thu 23 Oct 2014 18:56:05 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream: (32 commits)
  qemu-img: Print error if check failed
  block: char devices on FreeBSD are not behind a pager
  iotests: Add test for qcow2 L1 table update
  qcow2: Do not overflow when writing an L1 sector
  iotests: Add test for map commands
  qemu-io: Respect early image end for map
  block: Respect underlying file's EOF
  docs/qcow2: Limit refcount_order to [0, 6]
  docs/qcow2: Correct refcount_block_entries
  qcow2: Drop REFCOUNT_SHIFT
  iotests: Add test for potentially damaging repairs
  iotests: Fix test outputs
  qcow2: Clean up after refcount rebuild
  qcow2: Rebuild refcount structure during check
  qcow2: Do not perform potentially damaging repairs
  qcow2: Fix refcount blocks beyond image end
  qcow2: Reuse refcount table in calculate_refcounts()
  qcow2: Let inc_refcounts() resize the reftable
  qcow2: Let inc_refcounts() return -errno
  qcow2: Split fail code in L1 and L2 checks
  ...

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


Compare: https://github.com/qemu/qemu/compare/1430500bb8ba...8b135a288ae8