]> git.proxmox.com Git - mirror_qemu.git/commit
projects / mirror_qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b6825cd eec7f96)
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:01:05 +0000 (13:01 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 22 Aug 2012 18:01:05 +0000 (13:01 -0500)
commit7b2f89c435f895431d55b675dc412275c2069314
tree5be26fa2548653d69d30733bf8d9e7eddf902af8tree
parentb6825cd79cdf3e2006c22bb8cfe47a0d7c5209facommit | diff
parenteec7f96c2cac88f59fd8c79b78a6e027df4abfb2commit | diff
Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
  virtio-blk: hide VIRTIO_BLK_F_CONFIG_WCE from old machine types
  Documentation: Warn against qemu-img on active image
  vmdk: Read footer for streamOptimized images
  vmdk: Fix header structure

Conflicts:
hw/virtio-blk.c
hw/virtio-blk.h diff1 | diff2 | blob | history
QEMU mirror