From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 22 Mar 2013 18:05:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f9308207040dc4a1484cee459bedaec03645b935;p=qemu.git

Merge remote-tracking branch 'cohuck/virtio-ccw-upstr' into staging

# By Cornelia Huck
# Via Cornelia Huck
* cohuck/virtio-ccw-upstr:
  virtio-ccw, s390-virtio: Use generic virtio-blk macro.
  s390-virtio, virtio-ccw: Add config_wce for virtio-blk.
  virtio-ccw: Add missing blk chs properties.
---

f9308207040dc4a1484cee459bedaec03645b935