On Mon, Oct 2, 2017 at 9:15 PM, Dr. David Alan Gilbert (git)
<dgilb...@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
>
> 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: Dr. David Alan Gilbert <dgilb...@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> contrib/libvhost-user/libvhost-user.c | 10 +++++-----
> contrib/libvhost-user/libvhost-user.h | 9 ++++++++-
> 2 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/contrib/libvhost-user/libvhost-user.c
> b/contrib/libvhost-user/libvhost-user.c
> index 5ee8483a32..1901311a70 100644
> --- a/contrib/libvhost-user/libvhost-user.c
> +++ b/contrib/libvhost-user/libvhost-user.c
> @@ -35,16 +35,13 @@
> } 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),
> REQ(VHOST_USER_SET_OWNER),
> REQ(VHOST_USER_RESET_OWNER),
> REQ(VHOST_USER_SET_MEM_TABLE),
> @@ -62,7 +59,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
> diff --git a/contrib/libvhost-user/libvhost-user.h
> b/contrib/libvhost-user/libvhost-user.h
> index 94d7cc8fbd..c2fc6da720 100644
> --- a/contrib/libvhost-user/libvhost-user.h
> +++ b/contrib/libvhost-user/libvhost-user.h
> @@ -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;
>
> --
> 2.13.6
>
>
--
Marc-André Lureau
