New upstream version 18.11-rc1

[deb_dpdk.git] / lib / librte_vhost / vhost_user.h

diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h
index 42166ad..dc97be8 100644 (file)
--- a/lib/librte_vhost/vhost_user.h
+++ b/lib/librte_vhost/vhost_user.h
@@ -22,7 +22,8 @@
                                         (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \
                                         (1ULL << VHOST_USER_PROTOCOL_F_CRYPTO_SESSION) | \
                                         (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \
-                                        (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER))
+                                        (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \
+                                        (1ULL << VHOST_USER_PROTOCOL_F_PAGEFAULT))
 
 typedef enum VhostUserRequest {
        VHOST_USER_NONE = 0,
@@ -50,7 +51,10 @@ typedef enum VhostUserRequest {
        VHOST_USER_IOTLB_MSG = 22,
        VHOST_USER_CRYPTO_CREATE_SESS = 26,
        VHOST_USER_CRYPTO_CLOSE_SESS = 27,
-       VHOST_USER_MAX = 28
+       VHOST_USER_POSTCOPY_ADVISE = 28,
+       VHOST_USER_POSTCOPY_LISTEN = 29,
+       VHOST_USER_POSTCOPY_END = 30,
+       VHOST_USER_MAX = 31
 } VhostUserRequest;
 
 typedef enum VhostUserSlaveRequest {
@@ -132,6 +136,7 @@ typedef struct VhostUserMsg {
                VhostUserVringArea area;
        } payload;
        int fds[VHOST_MEMORY_MAX_NREGIONS];
+       int fd_num;
 } __attribute((packed)) VhostUserMsg;
 
 #define VHOST_USER_HDR_SIZE offsetof(VhostUserMsg, payload.u64)
@@ -146,7 +151,8 @@ int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm);
 int vhost_user_host_notifier_ctrl(int vid, bool enable);
 
 /* socket.c */
-int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num);
+int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds,
+               int *fd_num);
 int send_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num);
 
 #endif