Commit ea642e22 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Marc-André Lureau
Browse files

libvhost-user: Update and fix feature and request lists 



Update the ProtocolFeature and UserRequest lists to
match hw/virtio/vhost-user.c.
Fix the text labelling in libvhost-user.c to match the list.

Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20171002191521.15748-4-dgilbert@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMaxime Coquelin <maxime.coquelin@redhat.com>
parent 12176528

contrib/libvhost-user/libvhost-user.c

+5 −5
Original line number Diff line number Diff line
@@ -56,13 +56,10 @@ 
    } while (0)



static const char *

vu_request_to_string(int req)

vu_request_to_string(unsigned int req)

{

#define REQ(req) [req] = #req

    static const char *vu_request_str[] = {

        REQ(VHOST_USER_NONE),

        REQ(VHOST_USER_GET_FEATURES),

        REQ(VHOST_USER_SET_FEATURES),

        REQ(VHOST_USER_NONE),

        REQ(VHOST_USER_GET_FEATURES),

        REQ(VHOST_USER_SET_FEATURES),
@@ -83,7 +80,10 @@ vu_request_to_string(int req) 
        REQ(VHOST_USER_GET_QUEUE_NUM),

        REQ(VHOST_USER_SET_VRING_ENABLE),

        REQ(VHOST_USER_SEND_RARP),

        REQ(VHOST_USER_INPUT_GET_CONFIG),

        REQ(VHOST_USER_NET_SET_MTU),

        REQ(VHOST_USER_SET_SLAVE_REQ_FD),

        REQ(VHOST_USER_IOTLB_MSG),

        REQ(VHOST_USER_SET_VRING_ENDIAN),

        REQ(VHOST_USER_MAX),

    };

#undef REQ

contrib/libvhost-user/libvhost-user.h

+8 −1
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ enum VhostUserProtocolFeature { 
    VHOST_USER_PROTOCOL_F_MQ = 0,

    VHOST_USER_PROTOCOL_F_LOG_SHMFD = 1,

    VHOST_USER_PROTOCOL_F_RARP = 2,

    VHOST_USER_PROTOCOL_F_REPLY_ACK = 3,

    VHOST_USER_PROTOCOL_F_NET_MTU = 4,

    VHOST_USER_PROTOCOL_F_SLAVE_REQ = 5,

    VHOST_USER_PROTOCOL_F_CROSS_ENDIAN = 6,



    VHOST_USER_PROTOCOL_F_MAX

};
@@ -61,7 +65,10 @@ typedef enum VhostUserRequest { 
    VHOST_USER_GET_QUEUE_NUM = 17,

    VHOST_USER_SET_VRING_ENABLE = 18,

    VHOST_USER_SEND_RARP = 19,

    VHOST_USER_INPUT_GET_CONFIG = 20,

    VHOST_USER_NET_SET_MTU = 20,

    VHOST_USER_SET_SLAVE_REQ_FD = 21,

    VHOST_USER_IOTLB_MSG = 22,

    VHOST_USER_SET_VRING_ENDIAN = 23,

    VHOST_USER_MAX

} VhostUserRequest;