diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2012-12-10 13:14:39 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-01-02 15:59:20 +0100 |
| commit | 8a873ba78069ef81c4ef073a0bd703172c8b3312 (patch) | |
| tree | 39e3dbbbf08451322ba648ab9fd927416a188eed /hw/virtio-blk.c | |
| parent | 530c0bbd73e1b658c9266582072847de1fbdff10 (diff) | |
| download | focaccia-qemu-8a873ba78069ef81c4ef073a0bd703172c8b3312.tar.gz focaccia-qemu-8a873ba78069ef81c4ef073a0bd703172c8b3312.zip | |
virtio-blk: restore VirtIOBlkConf->config_wce flag
Two slightly different versions of a patch to conditionally set VIRTIO_BLK_F_CONFIG_WCE through the "config-wce" qdev property have been applied (ea776abca and eec7f96c2). David Gibson <david@gibson.dropbear.id.au> noticed that the "config-wce" property is broken as a result and fixed it recently. The fix sets the host_features VIRTIO_BLK_F_CONFIG_WCE bit from a qdev property. Unfortunately, the virtio device then has no chance to test for the presence of the feature bit during virtio_blk_init(). Therefore, reinstate the VirtIOBlkConf->config_wce flag. Drop the duplicate qdev property to set the host_features bit. The VirtIOBlkConf->config_wce flag will be used by virtio-blk-data-plane in a later patch. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/virtio-blk.c')
| -rw-r--r-- | hw/virtio-blk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 90cfa246db..f004148e3e 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -524,6 +524,9 @@ static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features) features |= (1 << VIRTIO_BLK_F_BLK_SIZE); features |= (1 << VIRTIO_BLK_F_SCSI); + if (s->blk->config_wce) { + features |= (1 << VIRTIO_BLK_F_CONFIG_WCE); + } if (bdrv_enable_write_cache(s->bs)) features |= (1 << VIRTIO_BLK_F_WCE); |