From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 3 May 2013 16:20:02 +0000 (-0500)
Subject: Merge remote-tracking branch 'stefanha/block' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=25565e8595322b04902a09ebf877d80532f22fd1;p=qemu.git

Merge remote-tracking branch 'stefanha/block' into staging

# By Fam Zheng (8) and others
# Via Stefan Hajnoczi
* stefanha/block:
  qemu-iotests: Filter out 'adapter_type'
  nbd: support large NBD requests
  nbd: use g_slice_new() instead of a freelist
  qemu-iotests: Filter out vmdk creation options
  vmdk: add bdrv_co_write_zeroes
  vmdk: store fields of VmdkMetaData in cpu endian
  vmdk: change magic number to macro
  vmdk: Add option to create zeroed-grain image
  vmdk: add support for “zeroed‐grain” GTE
  vmdk: named return code.
  blockdev: Replace "undefined error" in qmp_block_resize
  block: add read-only support to VHDX image format.
  block: initial VHDX driver support framework - supports open and probe
  block: vhdx header for the QEMU support of VHDX images
  qemu: add castagnoli crc32c checksum algorithm
---

25565e8595322b04902a09ebf877d80532f22fd1