Commit eeb39263 authored by Johannes Berg's avatar Johannes Berg Committed by Michael S. Tsirkin
Browse files

libvhost-user: introduce and use vu_has_protocol_feature() 



This simplifies the various has_feature() checks, we already
have vu_has_feature() but it checks features, not protocol
features.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Message-Id: <20190904065021.1360-1-johannes@sipsolutions.net>
Reviewed-by: default avatarTiwei Bie <tiwei.bie@intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 8726b70b

contrib/libvhost-user/libvhost-user.c

+10 −10
Original line number Diff line number Diff line
@@ -94,6 +94,11 @@ bool vu_has_feature(VuDev *dev, 
    return has_feature(dev->features, fbit);

}



static inline bool vu_has_protocol_feature(VuDev *dev, unsigned int fbit)

{

    return has_feature(dev->protocol_features, fbit);

}



static const char *

vu_request_to_string(unsigned int req)

{
@@ -951,8 +956,7 @@ vu_check_queue_inflights(VuDev *dev, VuVirtq *vq) 
{

    int i = 0;



    if (!has_feature(dev->protocol_features,

        VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

        return 0;

    }
@@ -1097,8 +1101,7 @@ bool vu_set_queue_host_notifier(VuDev *dev, VuVirtq *vq, int fd, 


    vmsg.fd_num = fd_num;



    if (!has_feature(dev->protocol_features,

                     VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)) {

        return false;

    }
@@ -2191,8 +2194,7 @@ vu_queue_map_desc(VuDev *dev, VuVirtq *vq, unsigned int idx, size_t sz) 
static int

vu_queue_inflight_get(VuDev *dev, VuVirtq *vq, int desc_idx)

{

    if (!has_feature(dev->protocol_features,

        VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

        return 0;

    }
@@ -2209,8 +2211,7 @@ vu_queue_inflight_get(VuDev *dev, VuVirtq *vq, int desc_idx) 
static int

vu_queue_inflight_pre_put(VuDev *dev, VuVirtq *vq, int desc_idx)

{

    if (!has_feature(dev->protocol_features,

        VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

        return 0;

    }
@@ -2226,8 +2227,7 @@ vu_queue_inflight_pre_put(VuDev *dev, VuVirtq *vq, int desc_idx) 
static int

vu_queue_inflight_post_put(VuDev *dev, VuVirtq *vq, int desc_idx)

{

    if (!has_feature(dev->protocol_features,

        VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

    if (!vu_has_protocol_feature(dev, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)) {

        return 0;

    }