[Qemu-commits] [qemu/qemu] ff7938: iotests: remove assertIsNotNone call

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ff793890faeb119c8dad53b7ed614407ff7b027a
      
https://github.com/qemu/qemu/commit/ff793890faeb119c8dad53b7ed614407ff7b027a
  Author: John Snow <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M tests/qemu-iotests/124

  Log Message:
  -----------
  iotests: remove assertIsNotNone call

RHEL6 doesn't have Python 2.7, so replace this call with
assertNotEqual(x, None) which will work just as well.

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


  Commit: 9aa711d75030356f1e179b9f71780da5fd1a45bb
      
https://github.com/qemu/qemu/commit/9aa711d75030356f1e179b9f71780da5fd1a45bb
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M tests/qemu-iotests/128

  Log Message:
  -----------
  qemu-iotests: Fix 128 if sudo required

If passwordless "sudo" works, use it in the qemu-io cmd.

Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: 57e216695948a79d9ced82fc217a37cce70fd986
      
https://github.com/qemu/qemu/commit/57e216695948a79d9ced82fc217a37cce70fd986
  Author: Max Reitz <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block/qcow2.h

  Log Message:
  -----------
  qcow2: Set MIN_L2_CACHE_SIZE to 2

The L2 cache must cover at least two L2 tables, because during COW two
L2 tables are accessed simultaneously.

Reported-by: Alexander Graf <address@hidden>
Cc: qemu-stable <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Tested-by: Alexander Graf <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>


  Commit: a4291eafc597c0944057930acf3e51d899f79c2e
      
https://github.com/qemu/qemu/commit/a4291eafc597c0944057930acf3e51d899f79c2e
  Author: Max Reitz <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  iotests: qcow2 COW with minimal L2 cache size

This adds a test case to test 103 for performing a COW operation in a
qcow2 image using an L2 cache with minimal size (which should be at
least two clusters so the COW can access both source and destination
simultaneously).

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


  Commit: bc85ef265a0118d044ff62ae217c186cb08e0866
      
https://github.com/qemu/qemu/commit/bc85ef265a0118d044ff62ae217c186cb08e0866
  Author: Max Reitz <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  qcow2: Add DEFAULT_L2_CACHE_CLUSTERS

If a relatively large cluster size is chosen, the default of 1 MB L2
cache is not really appropriate. In this case, unless overridden by the
user, the default cache size should not be determined by its size in
bytes but by the number of L2 tables (clusters) it is supposed to
contain.

Note that without this patch, MIN_L2_CACHE_SIZE will effectively take
over the same role. However, providing space for just two L2 tables is
not enough to be the default.

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


  Commit: 61f0ed1d54601b91b8195c1a30d7046f83283b40
      
https://github.com/qemu/qemu/commit/61f0ed1d54601b91b8195c1a30d7046f83283b40
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status

It has the similar issue with b1649fae49a8. Since the calculation
is repeated for a few times already, introduce a function so it can be
reused.

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


  Commit: 90df601f06de14f062d2e8dc1bc57f0decf86fd1
      
https://github.com/qemu/qemu/commit/90df601f06de14f062d2e8dc1bc57f0decf86fd1
  Author: Fam Zheng <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: Use vmdk_find_index_in_cluster everywhere

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


  Commit: b8684454e152ca2e100f4b59d80de2be27186206
      
https://github.com/qemu/qemu/commit/b8684454e152ca2e100f4b59d80de2be27186206
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block/raw-posix.c

  Log Message:
  -----------
  raw-posix: Fix .bdrv_co_get_block_status() for unaligned image size

Image files with an unaligned image size have a final hole that starts
at EOF, i.e. in the middle of a sector. Currently, *pnum == 0 is
returned when checking the status of this sector. In qemu-img, this
triggers an assertion failure.

In order to fix this, one type for the sector that contains EOF must be
found. Treating a hole as data is safe, so this patch rounds the
calculated number of data sectors up, so that a partial sector at EOF is
treated as a full data sector.

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1229394

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


  Commit: 5270b6a0d0cf41e49d634007ace40f5dfc381940
      
https://github.com/qemu/qemu/commit/5270b6a0d0cf41e49d634007ace40f5dfc381940
  Author: John Snow <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: record new size in bdrv_dirty_bitmap_truncate

ce1ffea8 neglected to update the BdrvDirtyBitmap structure
itself for internal consistency. It's currently not an issue,
but for migration and persistence series this will cause headaches.

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


  Commit: 06207b0ff596aa4bb192d1fafc593847ed888e39
      
https://github.com/qemu/qemu/commit/06207b0ff596aa4bb192d1fafc593847ed888e39
  Author: John Snow <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Change bitmap truncate conditional to assertion

This is an artifact of an older version that had both all-bitmap and
single-bitmap truncate functions, and some info got lost in the shuffle.

Bitmaps can only be frozen during a backup operation, and a backup
operation should prevent a resize operation, so just assert that this
cannot happen.

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


  Commit: 53a295131274c87914c97053e2ca00f19a9c2efa
      
https://github.com/qemu/qemu/commit/53a295131274c87914c97053e2ca00f19a9c2efa
  Author: Max Reitz <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  block: driver should override flags in bdrv_open()

The BDRV_O_PROTOCOL flag should have an impact only if no driver is
specified explicitly. Therefore, if bdrv_open() is called with an
explicit block driver argument (either through the options QDict or
through the drv parameter) and that block driver is a protocol block
driver, BDRV_O_PROTOCOL should be set; if it is a format block driver,
BDRV_O_PROTOCOL should be unset.

While there was code to unset the flag in case a format block driver
has been selected, it only followed the bdrv_fill_options() function
call whereas the flag in fact needs to be adjusted before it is used
there.

With that change, BDRV_O_PROTOCOL will always be set if the BDS should
be a protocol driver; if the driver has been specified explicitly, the
new code will set it; and bdrv_fill_options() will only "probe" a
protocol driver if BDRV_O_PROTOCOL is set. The probing after
bdrv_fill_options() cannot select a protocol driver.

Thus, bdrv_open_image() to open BDS.file is never called if a protocol
BDS is about to be created. With that change in turn it is impossible to
call bdrv_open_common() with a protocol drv and file != NULL, which
allows us to remove the bdrv_swap() call.

This change breaks a test case in qemu-iotest 051:
"-drive file=t.qcow2,file.driver=qcow2" now works because the explicitly
specified "qcow2" overrides the BDRV_O_PROTOCOL which is automatically
set for the "file" BDS (and the filename is just passed down).
Therefore, this patch removes that test case.

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


  Commit: a68197ff5b11f5a58d48e485d16a36758aeca7f4
      
https://github.com/qemu/qemu/commit/a68197ff5b11f5a58d48e485d16a36758aeca7f4
  Author: Max Reitz <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  iotests: Add tests for overriding BDRV_O_PROTOCOL

This adds tests for overriding the qemu-internal BDRV_O_PROTOCOL flag by
explicitly specifying a block driver. As one test must be run over the
NBD protocol while the other must not, this patch adds two separate
iotests.

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


  Commit: bd50530a9f40f6560a03caeaaddd451e2ce90ed8
      
https://github.com/qemu/qemu/commit/bd50530a9f40f6560a03caeaaddd451e2ce90ed8
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/qapi/qmp/qdict.h
    M qobject/qdict.c

  Log Message:
  -----------
  qdict: Add qdict_array_entries()

This counts the entries in a flattened array in a QDict without
actually splitting the QDict into a QList.

bdrv_open_image() doesn't take a QList, but rather a QDict and a key
prefix string, so this is more convenient for block drivers which have a
dynamically sized list of child nodes (e.g. Quorum) and are to be
converted to using bdrv_open_image() as the standard interface for
opening child nodes.

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


  Commit: 7990d2c99c974ae8e3c3f719d8321ddc6eac93bc
      
https://github.com/qemu/qemu/commit/7990d2c99c974ae8e3c3f719d8321ddc6eac93bc
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/qapi/qmp/qdict.h
    M qobject/qdict.c

  Log Message:
  -----------
  qdict: Add qdict_{set,copy}_default()

In the block layer functions that determine options for a child block
device, it's a common pattern to either copy options from the parent's
options or to set a default string if the option isn't explicitly set
yet for the child. Provide convenience functions so that it becomes a
one-liner for each option.

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


  Commit: ef1919df26b9b094aa41733466b134111fcdbd36
      
https://github.com/qemu/qemu/commit/ef1919df26b9b094aa41733466b134111fcdbd36
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M tests/check-qdict.c

  Log Message:
  -----------
  check-qdict: Test cases for new functions

This adds test cases for the following new QDict functions:

* qdict_array_entries()
* qdict_set_default_str()
* qdict_copy_default()

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


  Commit: ea6828d81b34d42f407e8de28694d2751ee660a2
      
https://github.com/qemu/qemu/commit/ea6828d81b34d42f407e8de28694d2751ee660a2
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block/quorum.c

  Log Message:
  -----------
  quorum: Use bdrv_open_image()

Besides standardising on a single interface for opening child nodes,
this simplifies the .bdrv_open() implementation of the quorum block
driver by using block layer functionality for handling BlockdevRefs.

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


  Commit: a646836784a0fc50fee6f9a0d3fb968289714128
      
https://github.com/qemu/qemu/commit/a646836784a0fc50fee6f9a0d3fb968289714128
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block/vmdk.c

  Log Message:
  -----------
  vmdk: Use bdrv_open_image()

Besides standardising on a single interface for opening child nodes,
this patch allows the user to specify options to individual extent
nodes. Overriding file names isn't possible with this yet, so it's of
limited usefulness, but still a step forward.

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


  Commit: 54861b9280e95dd16c062b26a9d0adfe3608c63c
      
https://github.com/qemu/qemu/commit/54861b9280e95dd16c062b26a9d0adfe3608c63c
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  block: Use macro for cache option names

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


  Commit: 18edf289a8951f3a48caff3b5fe17f2d414c2924
      
https://github.com/qemu/qemu/commit/18edf289a8951f3a48caff3b5fe17f2d414c2924
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Use QemuOpts in bdrv_open_common()

Instead of manually parsing options and then deleting them from the
options QDict, just use QemuOpts like most other places that deal with
block device options.

More options will be added there and then QemuOpts is a lot more
manageable than open-coding everything.

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


  Commit: f3930ed0bb1945b59da8e591072b5c79606d0760
      
https://github.com/qemu/qemu/commit/f3930ed0bb1945b59da8e591072b5c79606d0760
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block.c
    M block/blkdebug.c
    M block/blkverify.c
    M block/quorum.c
    M block/vmdk.c
    M include/block/block.h
    M include/block/block_int.h

  Log Message:
  -----------
  block: Move flag inheritance to bdrv_open_inherit()

Instead of letting every caller of bdrv_open() determine the right flags
for its child node manually and pass them to the function, pass the
parent node and the role of the newly opened child (like backing file,
protocol layer, etc.).

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


  Commit: 6ee4ce1ee75a651c246d926c2302281b51981f6d
      
https://github.com/qemu/qemu/commit/6ee4ce1ee75a651c246d926c2302281b51981f6d
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block.c

  Log Message:
  -----------
  block: Drain requests before swapping nodes in bdrv_swap()

bdrv_swap() requires that there are no requests in flight on either of
the two devices. The request coroutine would work on the wrong
BlockDriverState object (with bs->opaque even being interpreted as a
different type potentially) and all sorts of bad things would result
from this.

The currently existing callers mostly ensure that there is no I/O
pending on nodes that are swapped. In detail, this is:

1. Live snapshots. This goes through qmp_transaction(), which calls
   bdrv_drain_all() before doing anything. The command is executed
   synchronously, so no new I/O can be issued concurrently.

2. snapshot=on in bdrv_open(). We're in the middle of opening the image
   (both the original image and its temporary overlay), so there can't
   be any I/O in flight yet.

3. Mirroring. bdrv_drain() is already used on the source device so that
   the mirror doesn't miss anything. However, the main loop runs between
   that and the bdrv_swap() (which is actually a bug, being addressed in
   another series), so there is a small window in which new I/O might be
   issued that would be in flight during bdrv_swap().

It is safer to just drain the request queue of both devices in
bdrv_swap() instead of relying on callers to do the right thing.

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


  Commit: ae81693004fd95f7013e42811944707a92948d9a
      
https://github.com/qemu/qemu/commit/ae81693004fd95f7013e42811944707a92948d9a
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M include/qemu/queue.h

  Log Message:
  -----------
  queue.h: Add QLIST_FIX_HEAD_PTR()

If the head of a list has been moved to a different memory location, the
le_prev link in the first list entry has to be fixed up. Provide a macro
that implements this fixup.

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


  Commit: 6e93e7c41fdfdee3068770cae79380e1d986b76a
      
https://github.com/qemu/qemu/commit/6e93e7c41fdfdee3068770cae79380e1d986b76a
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  block: Add list of children to BlockDriverState

This allows iterating over all children of a given BDS, not only
including bs->file and bs->backing_hd, but also driver-specific
ones like VMDK extents or Quorum children.

For bdrv_swap(), the list of children of the swapped BDS stays at that
BDS (because that's where the pointers stay as well). The list head
moves and pointers to it must be fixed up therefore.

The list of children in the parent of the swapped BDS is not affected by
the swap. The contents of the BDS objects is swapped, so the existing
pointer in the parent automatically points to the newly swapped in BDS.

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


  Commit: bddcec3745b0220d4a7eda700950812a94398668
      
https://github.com/qemu/qemu/commit/bddcec3745b0220d4a7eda700950812a94398668
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

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

  Log Message:
  -----------
  block: Add BlockDriverState.inherits_from

Currently, the block layer assumes that any block node can have only one
parent, and if it has a parent, that it inherits some options/flags from
this parent.

This is not true any more: With references used in block device
creation, a single node can be used by multiple parents, or it can be
created separately and not inherit flags from any parent.

To handle reopens correctly, a node must know from which parent it
inherited options. This patch adds the information to BlockDriverState.

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


  Commit: 67251a311371c4d22e803f151f47fe817175b6c3
      
https://github.com/qemu/qemu/commit/67251a311371c4d22e803f151f47fe817175b6c3
  Author: Kevin Wolf <address@hidden>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M block.c
    M block/vmdk.c

  Log Message:
  -----------
  block: Fix reopen flag inheritance

When reopening an image, the block layer already takes care to reopen
bs->file as well with recalculated inherited flags. The same must happen
for any other child (most notably missing before this patch: backing
files).

If bs->file (or any other child) didn't originally inherit from bs, e.g.
because it was created separately and then only referenced, it must not
inherit flags on reopen either, so check the inherited_from field before
propagation the reopen down.

VMDK already reopened its extents manually; this code can now be
dropped.

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


  Commit: f3e3b083d4c266ea864ae3c83da49d4086857679
      
https://github.com/qemu/qemu/commit/f3e3b083d4c266ea864ae3c83da49d4086857679
  Author: Peter Maydell <address@hidden>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M block.c
    M block/blkdebug.c
    M block/blkverify.c
    M block/qcow2.c
    M block/qcow2.h
    M block/quorum.c
    M block/vmdk.c
    M blockdev.c
    M include/block/block.h
    M include/block/block_int.h
    M include/qapi/qmp/qdict.h
    M include/qemu/queue.h
    M qobject/qdict.c
    M tests/check-qdict.c
    M tests/qemu-iotests/051
    M tests/qemu-iotests/051.out
    M tests/qemu-iotests/103
    M tests/qemu-iotests/103.out
    A tests/qemu-iotests/119
    A tests/qemu-iotests/119.out
    A tests/qemu-iotests/120
    A tests/qemu-iotests/120.out
    M tests/qemu-iotests/124
    M tests/qemu-iotests/128
    M tests/qemu-iotests/group

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

Block layer core and image format patches

# gpg: Signature made Fri Jun 12 16:08:53 2015 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <address@hidden>"

* remotes/kevin/tags/for-upstream: (25 commits)
  block: Fix reopen flag inheritance
  block: Add BlockDriverState.inherits_from
  block: Add list of children to BlockDriverState
  queue.h: Add QLIST_FIX_HEAD_PTR()
  block: Drain requests before swapping nodes in bdrv_swap()
  block: Move flag inheritance to bdrv_open_inherit()
  block: Use QemuOpts in bdrv_open_common()
  block: Use macro for cache option names
  vmdk: Use bdrv_open_image()
  quorum: Use bdrv_open_image()
  check-qdict: Test cases for new functions
  qdict: Add qdict_{set,copy}_default()
  qdict: Add qdict_array_entries()
  iotests: Add tests for overriding BDRV_O_PROTOCOL
  block: driver should override flags in bdrv_open()
  block: Change bitmap truncate conditional to assertion
  block: record new size in bdrv_dirty_bitmap_truncate
  raw-posix: Fix .bdrv_co_get_block_status() for unaligned image size
  vmdk: Use vmdk_find_index_in_cluster everywhere
  vmdk: Fix index_in_cluster calculation in vmdk_co_get_block_status
  ...

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


Compare: https://github.com/qemu/qemu/compare/8aeaa055f5d3...f3e3b083d4c2