diff options
| author | Peter Maydell | 2014-02-05 17:29:01 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-02-05 17:29:01 +0100 |
| commit | e5d3df6deb664a31e6c69b36e07f1701fee7cbf5 (patch) | |
| tree | 841b8c96776663e62b563cb99c6574278ca90560 /target-i386/machine.c | |
| parent | Merge remote-tracking branch 'remotes/borntraeger/tags/kvm-s390-20140131' int... (diff) | |
| parent | qemu-iotests: only run 071 on qcow2 (diff) | |
| download | qemu-e5d3df6deb664a31e6c69b36e07f1701fee7cbf5.tar.gz qemu-e5d3df6deb664a31e6c69b36e07f1701fee7cbf5.tar.xz qemu-e5d3df6deb664a31e6c69b36e07f1701fee7cbf5.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Block pull request
# gpg: Signature made Fri 31 Jan 2014 21:16:43 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
qemu-iotests: only run 071 on qcow2
dataplane: Comment fix
block/vhdx: Error checking fixes
qemu-iotests: Drop assert_no_active_commit in case 040
block/vmdk: add basic .bdrv_check support
block: remove qcow2 .bdrv_make_empty implementation
block: remove QED .bdrv_make_empty implementation
Describe flaws in qcow/qcow2 encryption in the docs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386/machine.c')
0 files changed, 0 insertions, 0 deletions