]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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

1  2 
hw/virtio-blk.h patch | diff1 | diff2 | blob | history

diff --cc hw/virtio-blk.h
Simple merge
Qemu copy for testing