Commit 8a873ba7 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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 (ea776abc and eec7f96c).  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: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 530c0bbd

hw/virtio-blk.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

hw/virtio-blk.h

+2 −2
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ struct VirtIOBlkConf 
    BlockConf conf;

    char *serial;

    uint32_t scsi;

    uint32_t config_wce;

};



#define DEFINE_VIRTIO_BLK_FEATURES(_state, _field) \

        DEFINE_VIRTIO_COMMON_FEATURES(_state, _field), \

        DEFINE_PROP_BIT("config-wce", _state, _field, VIRTIO_BLK_F_CONFIG_WCE, true)

        DEFINE_VIRTIO_COMMON_FEATURES(_state, _field)



#endif

hw/virtio-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -894,6 +894,7 @@ static Property virtio_blk_properties[] = { 
#ifdef __linux__

    DEFINE_PROP_BIT("scsi", VirtIOPCIProxy, blk.scsi, 0, true),

#endif

    DEFINE_PROP_BIT("config-wce", VirtIOPCIProxy, blk.config_wce, 0, true),

    DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),

    DEFINE_VIRTIO_BLK_FEATURES(VirtIOPCIProxy, host_features),