From: Kevin Wolf <kwolf@redhat.com>
Date: Fri, 23 Jan 2015 17:51:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'mreitz/block' into queue-block
X-Git-Tag: v2.3.0-rc0~90^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bc63781ca350cad4c9eb142ce8f55bfaded4276e;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'mreitz/block' into queue-block

* mreitz/block:
  iotests: Lower 064's memory usage
  block: vhdx - force FileOffsetMB field to '0' for certain block states
---

bc63781ca350cad4c9eb142ce8f55bfaded4276e