tree c7727e413b24d8ae024fea2ab455f8c49be02b20
parent b2d4b3f7b8c8ad0519c4705a3b850446068e6946
parent b867672884afc39b6537a8aa6aa2f20a5154bf4f
author Anthony Liguori <aliguori@us.ibm.com> 1329347884 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1329347884 -0600

Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
  AHCI: Masking of IRQs actually masks them
  sheepdog: fix co_recv coroutine context
  AHCI: Fix port reset race
  rewrite QEMU_BUILD_BUG_ON
  qcow2: Keep unknown header extension when rewriting header
  qcow2: Update whole header at once
  vpc: Round up image size during fixed image creation
  vpc: Add support for Fixed Disk type
  iSCSI: add configuration variables for iSCSI
  qemu-io: add write -z option for bdrv_co_write_zeroes
  qed: add .bdrv_co_write_zeroes() support
  qed: replace is_write with flags field
  block: perform zero-detection during copy-on-read
  block: add .bdrv_co_write_zeroes() interface
  cutils: extract buffer_is_zero() from qemu-img.c