[v2,36/44] net/virtio: move Vhost-user reqs to Vhost-user backend
Checks
Commit Message
Now that we have a proper isolation of the backends,
we can move Vhost-user requests declaration to the
Vhost-user backend file.
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
drivers/net/virtio/virtio_user/vhost.h | 25 ---------------------
drivers/net/virtio/virtio_user/vhost_user.c | 25 +++++++++++++++++++++
2 files changed, 25 insertions(+), 25 deletions(-)
Comments
Hi Maxime,
> -----Original Message-----
> From: Maxime Coquelin <maxime.coquelin@redhat.com>
> Sent: Wednesday, January 20, 2021 5:25 AM
> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>; olivier.matz@6wind.com;
> amorenoz@redhat.com; david.marchand@redhat.com
> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
> Subject: [PATCH v2 36/44] net/virtio: move Vhost-user reqs to Vhost-user
Better use full name 'requests' if the title's not too long?
Same thing could be done for 'net/virtio: make Vhost-user req sender consistent'
With this fixed:
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
> backend
>
> Now that we have a proper isolation of the backends,
> we can move Vhost-user requests declaration to the
> Vhost-user backend file.
>
> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
> ---
> drivers/net/virtio/virtio_user/vhost.h | 25 ---------------------
> drivers/net/virtio/virtio_user/vhost_user.c | 25 +++++++++++++++++++++
> 2 files changed, 25 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/net/virtio/virtio_user/vhost.h
> b/drivers/net/virtio/virtio_user/vhost.h
> index 6294b8afee..2aa6b2cb70 100644
> --- a/drivers/net/virtio/virtio_user/vhost.h
> +++ b/drivers/net/virtio/virtio_user/vhost.h
> @@ -63,31 +63,6 @@ struct vhost_vring_addr {
> #define VHOST_USER_PROTOCOL_F_STATUS 16
> #endif
>
> -enum vhost_user_request {
> - VHOST_USER_NONE = 0,
> - VHOST_USER_GET_FEATURES = 1,
> - VHOST_USER_SET_FEATURES = 2,
> - VHOST_USER_SET_OWNER = 3,
> - VHOST_USER_RESET_OWNER = 4,
> - VHOST_USER_SET_MEM_TABLE = 5,
> - VHOST_USER_SET_LOG_BASE = 6,
> - VHOST_USER_SET_LOG_FD = 7,
> - VHOST_USER_SET_VRING_NUM = 8,
> - VHOST_USER_SET_VRING_ADDR = 9,
> - VHOST_USER_SET_VRING_BASE = 10,
> - VHOST_USER_GET_VRING_BASE = 11,
> - VHOST_USER_SET_VRING_KICK = 12,
> - VHOST_USER_SET_VRING_CALL = 13,
> - VHOST_USER_SET_VRING_ERR = 14,
> - VHOST_USER_GET_PROTOCOL_FEATURES = 15,
> - VHOST_USER_SET_PROTOCOL_FEATURES = 16,
> - VHOST_USER_GET_QUEUE_NUM = 17,
> - VHOST_USER_SET_VRING_ENABLE = 18,
> - VHOST_USER_SET_STATUS = 39,
> - VHOST_USER_GET_STATUS = 40,
> - VHOST_USER_MAX
> -};
> -
> #ifndef VHOST_BACKEND_F_IOTLB_MSG_V2
> #define VHOST_BACKEND_F_IOTLB_MSG_V2 1
> #endif
> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c
> b/drivers/net/virtio/virtio_user/vhost_user.c
> index d46e25b64b..fb6fcc82c9 100644
> --- a/drivers/net/virtio/virtio_user/vhost_user.c
> +++ b/drivers/net/virtio/virtio_user/vhost_user.c
> @@ -27,6 +27,31 @@ struct vhost_memory {
> struct vhost_memory_region regions[VHOST_MEMORY_MAX_NREGIONS];
> };
>
> +enum vhost_user_request {
> + VHOST_USER_NONE = 0,
> + VHOST_USER_GET_FEATURES = 1,
> + VHOST_USER_SET_FEATURES = 2,
> + VHOST_USER_SET_OWNER = 3,
> + VHOST_USER_RESET_OWNER = 4,
> + VHOST_USER_SET_MEM_TABLE = 5,
> + VHOST_USER_SET_LOG_BASE = 6,
> + VHOST_USER_SET_LOG_FD = 7,
> + VHOST_USER_SET_VRING_NUM = 8,
> + VHOST_USER_SET_VRING_ADDR = 9,
> + VHOST_USER_SET_VRING_BASE = 10,
> + VHOST_USER_GET_VRING_BASE = 11,
> + VHOST_USER_SET_VRING_KICK = 12,
> + VHOST_USER_SET_VRING_CALL = 13,
> + VHOST_USER_SET_VRING_ERR = 14,
> + VHOST_USER_GET_PROTOCOL_FEATURES = 15,
> + VHOST_USER_SET_PROTOCOL_FEATURES = 16,
> + VHOST_USER_GET_QUEUE_NUM = 17,
> + VHOST_USER_SET_VRING_ENABLE = 18,
> + VHOST_USER_SET_STATUS = 39,
> + VHOST_USER_GET_STATUS = 40,
> + VHOST_USER_MAX
> +};
> +
> struct vhost_user_msg {
> enum vhost_user_request request;
>
> --
> 2.29.2
On 1/21/21 9:56 AM, Xia, Chenbo wrote:
> Hi Maxime,
>
>> -----Original Message-----
>> From: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Sent: Wednesday, January 20, 2021 5:25 AM
>> To: dev@dpdk.org; Xia, Chenbo <chenbo.xia@intel.com>; olivier.matz@6wind.com;
>> amorenoz@redhat.com; david.marchand@redhat.com
>> Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
>> Subject: [PATCH v2 36/44] net/virtio: move Vhost-user reqs to Vhost-user
>
> Better use full name 'requests' if the title's not too long?
Fixed, that's not too long with requests.
> Same thing could be done for 'net/virtio: make Vhost-user req sender consistent'
Ditto
> With this fixed:
>
> Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
>
Thanks,
Maxime
>> backend
>>
>> Now that we have a proper isolation of the backends,
>> we can move Vhost-user requests declaration to the
>> Vhost-user backend file.
>>
>> Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
>> ---
>> drivers/net/virtio/virtio_user/vhost.h | 25 ---------------------
>> drivers/net/virtio/virtio_user/vhost_user.c | 25 +++++++++++++++++++++
>> 2 files changed, 25 insertions(+), 25 deletions(-)
>>
>> diff --git a/drivers/net/virtio/virtio_user/vhost.h
>> b/drivers/net/virtio/virtio_user/vhost.h
>> index 6294b8afee..2aa6b2cb70 100644
>> --- a/drivers/net/virtio/virtio_user/vhost.h
>> +++ b/drivers/net/virtio/virtio_user/vhost.h
>> @@ -63,31 +63,6 @@ struct vhost_vring_addr {
>> #define VHOST_USER_PROTOCOL_F_STATUS 16
>> #endif
>>
>> -enum vhost_user_request {
>> - VHOST_USER_NONE = 0,
>> - VHOST_USER_GET_FEATURES = 1,
>> - VHOST_USER_SET_FEATURES = 2,
>> - VHOST_USER_SET_OWNER = 3,
>> - VHOST_USER_RESET_OWNER = 4,
>> - VHOST_USER_SET_MEM_TABLE = 5,
>> - VHOST_USER_SET_LOG_BASE = 6,
>> - VHOST_USER_SET_LOG_FD = 7,
>> - VHOST_USER_SET_VRING_NUM = 8,
>> - VHOST_USER_SET_VRING_ADDR = 9,
>> - VHOST_USER_SET_VRING_BASE = 10,
>> - VHOST_USER_GET_VRING_BASE = 11,
>> - VHOST_USER_SET_VRING_KICK = 12,
>> - VHOST_USER_SET_VRING_CALL = 13,
>> - VHOST_USER_SET_VRING_ERR = 14,
>> - VHOST_USER_GET_PROTOCOL_FEATURES = 15,
>> - VHOST_USER_SET_PROTOCOL_FEATURES = 16,
>> - VHOST_USER_GET_QUEUE_NUM = 17,
>> - VHOST_USER_SET_VRING_ENABLE = 18,
>> - VHOST_USER_SET_STATUS = 39,
>> - VHOST_USER_GET_STATUS = 40,
>> - VHOST_USER_MAX
>> -};
>> -
>> #ifndef VHOST_BACKEND_F_IOTLB_MSG_V2
>> #define VHOST_BACKEND_F_IOTLB_MSG_V2 1
>> #endif
>> diff --git a/drivers/net/virtio/virtio_user/vhost_user.c
>> b/drivers/net/virtio/virtio_user/vhost_user.c
>> index d46e25b64b..fb6fcc82c9 100644
>> --- a/drivers/net/virtio/virtio_user/vhost_user.c
>> +++ b/drivers/net/virtio/virtio_user/vhost_user.c
>> @@ -27,6 +27,31 @@ struct vhost_memory {
>> struct vhost_memory_region regions[VHOST_MEMORY_MAX_NREGIONS];
>> };
>>
>> +enum vhost_user_request {
>> + VHOST_USER_NONE = 0,
>> + VHOST_USER_GET_FEATURES = 1,
>> + VHOST_USER_SET_FEATURES = 2,
>> + VHOST_USER_SET_OWNER = 3,
>> + VHOST_USER_RESET_OWNER = 4,
>> + VHOST_USER_SET_MEM_TABLE = 5,
>> + VHOST_USER_SET_LOG_BASE = 6,
>> + VHOST_USER_SET_LOG_FD = 7,
>> + VHOST_USER_SET_VRING_NUM = 8,
>> + VHOST_USER_SET_VRING_ADDR = 9,
>> + VHOST_USER_SET_VRING_BASE = 10,
>> + VHOST_USER_GET_VRING_BASE = 11,
>> + VHOST_USER_SET_VRING_KICK = 12,
>> + VHOST_USER_SET_VRING_CALL = 13,
>> + VHOST_USER_SET_VRING_ERR = 14,
>> + VHOST_USER_GET_PROTOCOL_FEATURES = 15,
>> + VHOST_USER_SET_PROTOCOL_FEATURES = 16,
>> + VHOST_USER_GET_QUEUE_NUM = 17,
>> + VHOST_USER_SET_VRING_ENABLE = 18,
>> + VHOST_USER_SET_STATUS = 39,
>> + VHOST_USER_GET_STATUS = 40,
>> + VHOST_USER_MAX
>> +};
>> +
>> struct vhost_user_msg {
>> enum vhost_user_request request;
>>
>> --
>> 2.29.2
>
@@ -63,31 +63,6 @@ struct vhost_vring_addr {
#define VHOST_USER_PROTOCOL_F_STATUS 16
#endif
-enum vhost_user_request {
- VHOST_USER_NONE = 0,
- VHOST_USER_GET_FEATURES = 1,
- VHOST_USER_SET_FEATURES = 2,
- VHOST_USER_SET_OWNER = 3,
- VHOST_USER_RESET_OWNER = 4,
- VHOST_USER_SET_MEM_TABLE = 5,
- VHOST_USER_SET_LOG_BASE = 6,
- VHOST_USER_SET_LOG_FD = 7,
- VHOST_USER_SET_VRING_NUM = 8,
- VHOST_USER_SET_VRING_ADDR = 9,
- VHOST_USER_SET_VRING_BASE = 10,
- VHOST_USER_GET_VRING_BASE = 11,
- VHOST_USER_SET_VRING_KICK = 12,
- VHOST_USER_SET_VRING_CALL = 13,
- VHOST_USER_SET_VRING_ERR = 14,
- VHOST_USER_GET_PROTOCOL_FEATURES = 15,
- VHOST_USER_SET_PROTOCOL_FEATURES = 16,
- VHOST_USER_GET_QUEUE_NUM = 17,
- VHOST_USER_SET_VRING_ENABLE = 18,
- VHOST_USER_SET_STATUS = 39,
- VHOST_USER_GET_STATUS = 40,
- VHOST_USER_MAX
-};
-
#ifndef VHOST_BACKEND_F_IOTLB_MSG_V2
#define VHOST_BACKEND_F_IOTLB_MSG_V2 1
#endif
@@ -27,6 +27,31 @@ struct vhost_memory {
struct vhost_memory_region regions[VHOST_MEMORY_MAX_NREGIONS];
};
+enum vhost_user_request {
+ VHOST_USER_NONE = 0,
+ VHOST_USER_GET_FEATURES = 1,
+ VHOST_USER_SET_FEATURES = 2,
+ VHOST_USER_SET_OWNER = 3,
+ VHOST_USER_RESET_OWNER = 4,
+ VHOST_USER_SET_MEM_TABLE = 5,
+ VHOST_USER_SET_LOG_BASE = 6,
+ VHOST_USER_SET_LOG_FD = 7,
+ VHOST_USER_SET_VRING_NUM = 8,
+ VHOST_USER_SET_VRING_ADDR = 9,
+ VHOST_USER_SET_VRING_BASE = 10,
+ VHOST_USER_GET_VRING_BASE = 11,
+ VHOST_USER_SET_VRING_KICK = 12,
+ VHOST_USER_SET_VRING_CALL = 13,
+ VHOST_USER_SET_VRING_ERR = 14,
+ VHOST_USER_GET_PROTOCOL_FEATURES = 15,
+ VHOST_USER_SET_PROTOCOL_FEATURES = 16,
+ VHOST_USER_GET_QUEUE_NUM = 17,
+ VHOST_USER_SET_VRING_ENABLE = 18,
+ VHOST_USER_SET_STATUS = 39,
+ VHOST_USER_GET_STATUS = 40,
+ VHOST_USER_MAX
+};
+
struct vhost_user_msg {
enum vhost_user_request request;