From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C5A0641E30; Thu, 9 Mar 2023 06:17:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5BDBB410EE; Thu, 9 Mar 2023 06:17:14 +0100 (CET) Received: from corp-ob08.yahoo-corp.jp (corp-ob08.yahoo-corp.jp [183.79.94.93]) by mails.dpdk.org (Postfix) with ESMTP id F2A1740ED7 for ; Thu, 9 Mar 2023 06:17:09 +0100 (CET) Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01lp2170.outbound.protection.outlook.com [104.47.23.170]) by corp-ob08.yahoo-corp.jp (Postfix) with ESMTPS id 6CA9B19FB18B; Thu, 9 Mar 2023 14:17:08 +0900 (JST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=en6tyOpLMjASuMktPOQex+L63mGPb68b+RAP4/KMgG3fXqnHsBdmTiGIyjTSWFt5HAapPpuR0tub+beoGACHBxi+KxHTKja3dbd/QuO95aClitxEwVjUvq1qUaW1+i0vEHmeSqte7BwGB7ysqC1ZFWnCLSY6CZstaU4HsgE9jLc8ScE3MaU7gH2cgOcNXzT3uyvbJlEsfSb1jUnYFeSJIQZjS7HYfW8lSsiZt2SFisCaFbo5EXyX6KMModMJP1U2GqGMoAzyQlXy+yvIQXKKyrW+iw+55Co9xXKY7SnoFIBGIVvHHKrVdPAaZJXym4LlAqFVsFJW4Ev0F4O+CzwYbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gGnaU00KEv6IGen3O6KE99lR10xYWKYFQXybtKef+io=; b=i4Sl/4KPUU5rw0LSWLJ/wDDXjtjLgr+98T7arsn3mrQkT+LmqoNf4sBpRAg/z/qPBk5RZDasXhVB/fh5NOgOxr6r2l5xG6xAIgDrgT2F/NVe4AE34Hyhyrvb1vqDvBgFduIuR67vdQMSX38Wmv24RWOKYH/d9ngXjqigiFmgYh7lVsh6I98/ue1+aOF2STbv4CYAieGGFimjM60yEVnCRyU/evK5vLQyaL3rewxXuSlS9xFzhB4HyweHSXhiGLlZVLQ2rdtUhdwj+aH2fE/+nJxWLt8+kXrPHXS6qn38EKzvIRYogm+HchjOvPzLMe0kSrLFM7hUBm0ZrS48lz6JFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=yahoo-corp.jp; dmarc=pass action=none header.from=yahoo-corp.jp; dkim=pass header.d=yahoo-corp.jp; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo-corp.jp; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gGnaU00KEv6IGen3O6KE99lR10xYWKYFQXybtKef+io=; b=e1rfn7uQJeGpbRtW0MLx6i9FKF6QoWvjdl2xPWPBa2McabzDxVAuIzv4AO/uuXEZs16aYKeZJIXjQVf8vES7yCONqFzmoghK4X/btHGMkR7KNYjvxZA3OJGs4KD+4KaOqe4YThhDCB5q6PFDEWQSxWESuwWWrhzCYnU39Zz9lF0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=yahoo-corp.jp; Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) by TYVPR01MB11358.jpnprd01.prod.outlook.com (2603:1096:400:366::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.18; Thu, 9 Mar 2023 05:17:06 +0000 Received: from TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::61fe:e4c3:a819:6ce6]) by TY2PR01MB4107.jpnprd01.prod.outlook.com ([fe80::61fe:e4c3:a819:6ce6%7]) with mapi id 15.20.6178.019; Thu, 9 Mar 2023 05:17:06 +0000 From: Nobuhiro MIKI To: maxime.coquelin@redhat.com, chenbo.xia@intel.com Cc: dev@dpdk.org, stephen@networkplumber.org, Nobuhiro MIKI Subject: [PATCH v2 1/2] vhost: fix constants to follow new naming convention Date: Thu, 9 Mar 2023 14:16:42 +0900 Message-Id: <20230309051643.70171-2-nmiki@yahoo-corp.jp> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230309051643.70171-1-nmiki@yahoo-corp.jp> References: <20230309051643.70171-1-nmiki@yahoo-corp.jp> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYCPR01CA0114.jpnprd01.prod.outlook.com (2603:1096:405:4::30) To TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR01MB4107:EE_|TYVPR01MB11358:EE_ X-MS-Office365-Filtering-Correlation-Id: e84ad91a-e948-44d1-2aff-08db205d8681 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2onkrdVpXtZKbLn4XsNQwGbJaLSYHTJs2Lq4pO4y/Im4fAQv6msRxx/ut8cFhPURfjuEKfBlo3S/Aq7F0Fu00mjhqqOggxiAh1moA5B3G/aLxcqm0GITy1jW+xEPpzj0u+o0hzL+eyhNY+89fVtqkRHXd+RH+zBXgdg12jfdYgce3QDOV1MQS0qKZw+X9RMqNb+WYaM7qEzq2tPht9XoqiC+7wDF40STMAq8nk2AUSxK+2jJR+2gQdFZUgm6JI9hEfmfJbwXiHHb/SsJh2mCmcna9+obZYYBb83/uOZU69cKmcDavH/b1pwlETQiD+Gj7kiHjYEbqWqhMWSCUjU2l1LRKDuFzs2jPv3xrR+83bCDSyixfX0/O9sJMVt7YDdv5Nb+OJnxQw4mCR19rK39YmmL6gqifl2PNF/zG6U8/4IQjMBm1QBPsDu+3k1lzG/8FVRhgK5jdk2/9kDhTiAf2QLF6cVpkt470YYiTDJ6dzTN5LNOH5qGkRN2oSWs+woleBKqOfAX1GkCncRvyrtmP+Si/Is/P0wRk2ExB+hT5e/mOU35rlJNYPOb+qngSofnAcR8QfN+9eHSRj/Gf1zj/uCVsSHM2kXt4K+ZlpxoGQoiWpQHIXG8vIi/GFqfIoHN/qqYjJ94cs7limNMJOiQpw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:TY2PR01MB4107.jpnprd01.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(366004)(346002)(39860400002)(136003)(396003)(376002)(451199018)(36756003)(6486002)(478600001)(966005)(316002)(52116002)(5660300002)(41300700001)(2906002)(8936002)(8676002)(66946007)(66556008)(66476007)(4326008)(107886003)(82960400001)(38100700002)(38350700002)(86362001)(186003)(6666004)(2616005)(1076003)(26005)(6512007)(6506007)(83380400001); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?on58qM7jJQfc4e9uacDseYOZsw45wM8Tq6frVyMgA4B28TzrTrlYv45zaFhQ?= =?us-ascii?Q?9q26GrKJ+amiKudxU+eIgtyP5j4vFAnJF/o2ynIJs7BbBzMq48zRRutNRHVz?= =?us-ascii?Q?zYqu+fddaY2mD48R7nGU0xWhhz70UmHrMYeDNlv8gZpwuGYHZyxUxnIoPkLw?= =?us-ascii?Q?dWvETLz79xuzcTBsGsY4sIDjteigKZYfZENRhUakgrS0PCUyLDBVEHni0xbb?= =?us-ascii?Q?7rfhiLB2Ru2urcl0rm0lFPrkudXn9foaZ8snvgkx2b/etlsdjXYboK5o7jCv?= =?us-ascii?Q?BuxMOYRi51ZfRTjnuO+nAYo0++9UjQM4wcuv7FlH/C21BjFdnMgBeUIMBKuu?= =?us-ascii?Q?yyce0QKGD5EufTY7SjCeUPQ+DOBpnksV7rs+WFsCHqs4C5bnqdbUQPTCqdm4?= =?us-ascii?Q?B8YXS0fbo008D6Ig8SGoQO0DpKiG4fNQfBwjT0zi5N7gq6Go2ZmahN1U7CVh?= =?us-ascii?Q?06LAxh3wZ6kfirSdxDKLQJpsE2RDHfis6XBGusCZwRRVM4CNISPHT1NqgBJW?= =?us-ascii?Q?+ts7Mj00UJUG/J4Mlcb3ClKz0A3JgbhfvWKy6Id6o2rfpz/Fzv+4c8hVcQxE?= =?us-ascii?Q?GUOC/j6lg7dhD/Fm8rcHIZRJorI5rLY96EOUJXqAxEEuHa2o0wlhQhk6ytvR?= =?us-ascii?Q?JmZf3aAivtaBy4td9j07shbkcZg1+fDOOt566/p/Z8SSVrPVQ2+HlZWdREY/?= =?us-ascii?Q?nE+/7s1QZSeOu4sIq64A5i9sovZqLrQkBm69qf//ASuNd2KnOtKKCPjmZ/Ru?= =?us-ascii?Q?lJTwLnOTgeTH8RlzMhioFTjpfwdbHnPzc4mHTabjkzgYiMKtcn8vOa4V0wE/?= =?us-ascii?Q?W9v7ooExeUfBXHwF/LjsbrpfzOh6uDlmpcR49BlbYXT4X/fIDhpxIyE5/tc0?= =?us-ascii?Q?mmxfnuREwELMf1KgQ7OTX7Lioo6E9sXC6+As9PpwhmXfzUv14iWN1eCHyZPu?= =?us-ascii?Q?cBZXrDrBqiSyReWG0Md7mV/WM5uge0SPLlcqu96TqWv8EChFC/CTOr6voP4w?= =?us-ascii?Q?qXQd8pKubOgIsfAPm4V9NFhlMAK679u1GhDCynTGeuhBEXGtgbj3s8hV6dAg?= =?us-ascii?Q?ITVUNhHFcku09gdGHLaim/DB2Upu1wQqWj6J4t+GpXvAFs7mcTy9hJP668Lj?= =?us-ascii?Q?uC13qO/M8M+rnHIzUSwtEVXlbgLapI48e5m2q9pNNFRB5KccSMWZYy2kxp5r?= =?us-ascii?Q?XSJnZXWhemq2+BdtU/7GXM/13TkSCO0EpT5/aYH2ydz06CBorX6GdPUAzeBk?= =?us-ascii?Q?Xjpbao7oXLdfwh5o9CN7TXwUHG/WfiUSH3vRJaP1vXvkTjudMI3NMZyrRntC?= =?us-ascii?Q?KsghuESi0P5+3rhNGDK7YZoeSQ6j27+mtrLGXGqh1VnHU5RyOMjBvVWJPNsn?= =?us-ascii?Q?POoTHZ0jUg6gqUFpmAww/HKiXMrMvfVSe04THqUXeTf6/WDiH4auKC9jTiB+?= =?us-ascii?Q?kDV+FbwDkSTD02u2vTh8iyOmXanpPbucsttLlUzQvcwBmC7vH4lY1DTfYMMt?= =?us-ascii?Q?i/+docJ3UPjdsFkHIgDkrpHph5gM9zMpT73qnyKAoJCiQr20PBcc0vUEiL5W?= =?us-ascii?Q?ZPwUOXs2YUNzvnw8xOW5y8k/ZffSL8OhZCAJ+1WA?= X-OriginatorOrg: yahoo-corp.jp X-MS-Exchange-CrossTenant-Network-Message-Id: e84ad91a-e948-44d1-2aff-08db205d8681 X-MS-Exchange-CrossTenant-AuthSource: TY2PR01MB4107.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2023 05:17:06.5435 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a208d369-cd4e-4f87-b119-98eaf31df2c3 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ugqd+jV4NEasTrgLTOxezdjfB4TfyRfwapeBvCAc4C6GEvYYr6Eosg/i+FtjEeBS9p7Y8S5XQslorxK/q+6vfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYVPR01MB11358 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org DPDK apps (e.g. dpdk-skeleton) output this name during negotiation. But, it is not consistent when debugging using QEMU as a front-end, for example. This is because QEMU already follows new naming convention [1]. Some type names and variable names, such as VhostUserSlaveRequest, are still in old naming convention. But, in this patch we only focus on constants. [1] https://qemu-project.gitlab.io/qemu/interop/vhost-user.html Signed-off-by: Nobuhiro MIKI Acked-by: Stephen Hemminger --- .mailmap | 2 +- drivers/vdpa/ifc/ifcvf_vdpa.c | 4 ++-- drivers/vdpa/mlx5/mlx5_vdpa.c | 4 ++-- drivers/vdpa/sfc/sfc_vdpa_ops.c | 4 ++-- lib/vhost/rte_vhost.h | 8 ++++---- lib/vhost/vhost_user.c | 14 +++++++------- lib/vhost/vhost_user.h | 14 +++++++------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.mailmap b/.mailmap index 8e7d78f37eef..3400241a6908 100644 --- a/.mailmap +++ b/.mailmap @@ -980,7 +980,7 @@ Nithin Dabilpuram Nitzan Weller Noa Ezra -Nobuhiro Miki +Nobuhiro MIKI Norbert Ciosek Odi Assli Ognjen Joldzic diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index 4a87673682fc..fe4d278c5380 100644 --- a/drivers/vdpa/ifc/ifcvf_vdpa.c +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c @@ -1315,8 +1315,8 @@ ifcvf_get_vdpa_features(struct rte_vdpa_device *vdev, uint64_t *features) #define VDPA_SUPPORTED_PROTOCOL_FEATURES \ (1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK | \ - 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ | \ - 1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD | \ + 1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ | \ + 1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD | \ 1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER | \ 1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD | \ 1ULL << VHOST_USER_PROTOCOL_F_MQ | \ diff --git a/drivers/vdpa/mlx5/mlx5_vdpa.c b/drivers/vdpa/mlx5/mlx5_vdpa.c index f8dfa9513311..f1737f82a8ae 100644 --- a/drivers/vdpa/mlx5/mlx5_vdpa.c +++ b/drivers/vdpa/mlx5/mlx5_vdpa.c @@ -37,8 +37,8 @@ (1ULL << VIRTIO_NET_F_MTU)) #define MLX5_VDPA_PROTOCOL_FEATURES \ - ((1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \ + ((1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD) | \ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \ (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD) | \ (1ULL << VHOST_USER_PROTOCOL_F_MQ) | \ diff --git a/drivers/vdpa/sfc/sfc_vdpa_ops.c b/drivers/vdpa/sfc/sfc_vdpa_ops.c index 6401d4e16f25..e88c7eeaa609 100644 --- a/drivers/vdpa/sfc/sfc_vdpa_ops.c +++ b/drivers/vdpa/sfc/sfc_vdpa_ops.c @@ -21,8 +21,8 @@ /* These protocol features are needed to enable notifier ctrl */ #define SFC_VDPA_PROTOCOL_FEATURES \ ((1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD) | \ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \ (1ULL << VHOST_USER_PROTOCOL_F_LOG_SHMFD) | \ (1ULL << VHOST_USER_PROTOCOL_F_MQ)) diff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h index a395843fe96d..ed255fc6c51f 100644 --- a/lib/vhost/rte_vhost.h +++ b/lib/vhost/rte_vhost.h @@ -80,8 +80,8 @@ extern "C" { #define VHOST_USER_PROTOCOL_F_NET_MTU 4 #endif -#ifndef VHOST_USER_PROTOCOL_F_SLAVE_REQ -#define VHOST_USER_PROTOCOL_F_SLAVE_REQ 5 +#ifndef VHOST_USER_PROTOCOL_F_BACKEND_REQ +#define VHOST_USER_PROTOCOL_F_BACKEND_REQ 5 #endif #ifndef VHOST_USER_PROTOCOL_F_CRYPTO_SESSION @@ -96,8 +96,8 @@ extern "C" { #define VHOST_USER_PROTOCOL_F_CONFIG 9 #endif -#ifndef VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD -#define VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD 10 +#ifndef VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD +#define VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD 10 #endif #ifndef VHOST_USER_PROTOCOL_F_HOST_NOTIFIER diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 9e361082dc9b..cd4104ea5ce0 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -2846,7 +2846,7 @@ VHOST_MESSAGE_HANDLER(VHOST_USER_GET_QUEUE_NUM, vhost_user_get_queue_num, false) VHOST_MESSAGE_HANDLER(VHOST_USER_SET_VRING_ENABLE, vhost_user_set_vring_enable, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SEND_RARP, vhost_user_send_rarp, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_NET_SET_MTU, vhost_user_net_set_mtu, false) \ -VHOST_MESSAGE_HANDLER(VHOST_USER_SET_SLAVE_REQ_FD, vhost_user_set_req_fd, true) \ +VHOST_MESSAGE_HANDLER(VHOST_USER_SET_BACKEND_REQ_FD, vhost_user_set_req_fd, true) \ VHOST_MESSAGE_HANDLER(VHOST_USER_IOTLB_MSG, vhost_user_iotlb_msg, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_GET_CONFIG, vhost_user_get_config, false) \ VHOST_MESSAGE_HANDLER(VHOST_USER_SET_CONFIG, vhost_user_set_config, false) \ @@ -3143,7 +3143,7 @@ vhost_user_msg_handler(int vid, int fd) case VHOST_USER_SET_VRING_ENABLE: case VHOST_USER_SEND_RARP: case VHOST_USER_NET_SET_MTU: - case VHOST_USER_SET_SLAVE_REQ_FD: + case VHOST_USER_SET_BACKEND_REQ_FD: if (!(dev->flags & VIRTIO_DEV_VDPA_CONFIGURED)) { vhost_user_lock_all_queue_pairs(dev); unlock_required = 1; @@ -3307,7 +3307,7 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm) int ret; struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_SLAVE_IOTLB_MSG, + .request.slave = VHOST_USER_BACKEND_IOTLB_MSG, .flags = VHOST_USER_VERSION, .size = sizeof(ctx.msg.payload.iotlb), .payload.iotlb = { @@ -3334,7 +3334,7 @@ rte_vhost_slave_config_change(int vid, bool need_reply) { struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_SLAVE_CONFIG_CHANGE_MSG, + .request.slave = VHOST_USER_BACKEND_CONFIG_CHANGE_MSG, .flags = VHOST_USER_VERSION, .size = 0, } @@ -3366,7 +3366,7 @@ static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev, int ret; struct vhu_msg_context ctx = { .msg = { - .request.slave = VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG, + .request.slave = VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG, .flags = VHOST_USER_VERSION | VHOST_USER_NEED_REPLY, .size = sizeof(ctx.msg.payload.area), .payload.area = { @@ -3410,9 +3410,9 @@ int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable) if (!(dev->features & (1ULL << VIRTIO_F_VERSION_1)) || !(dev->features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) || !(dev->protocol_features & - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ)) || + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ)) || !(dev->protocol_features & - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD)) || + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD)) || !(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER))) return -ENOTSUP; diff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h index 8ecca6859707..8e418414ba94 100644 --- a/lib/vhost/vhost_user.h +++ b/lib/vhost/vhost_user.h @@ -18,9 +18,9 @@ (1ULL << VHOST_USER_PROTOCOL_F_RARP) | \ (1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK) | \ (1ULL << VHOST_USER_PROTOCOL_F_NET_MTU) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_REQ) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_REQ) | \ (1ULL << VHOST_USER_PROTOCOL_F_CRYPTO_SESSION) | \ - (1ULL << VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \ + (1ULL << VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD) | \ (1ULL << VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \ (1ULL << VHOST_USER_PROTOCOL_F_PAGEFAULT) | \ (1ULL << VHOST_USER_PROTOCOL_F_STATUS)) @@ -47,7 +47,7 @@ typedef enum VhostUserRequest { VHOST_USER_SET_VRING_ENABLE = 18, VHOST_USER_SEND_RARP = 19, VHOST_USER_NET_SET_MTU = 20, - VHOST_USER_SET_SLAVE_REQ_FD = 21, + VHOST_USER_SET_BACKEND_REQ_FD = 21, VHOST_USER_IOTLB_MSG = 22, VHOST_USER_GET_CONFIG = 24, VHOST_USER_SET_CONFIG = 25, @@ -63,10 +63,10 @@ typedef enum VhostUserRequest { } VhostUserRequest; typedef enum VhostUserSlaveRequest { - VHOST_USER_SLAVE_NONE = 0, - VHOST_USER_SLAVE_IOTLB_MSG = 1, - VHOST_USER_SLAVE_CONFIG_CHANGE_MSG = 2, - VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG = 3, + VHOST_USER_BACKEND_NONE = 0, + VHOST_USER_BACKEND_IOTLB_MSG = 1, + VHOST_USER_BACKEND_CONFIG_CHANGE_MSG = 2, + VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG = 3, } VhostUserSlaveRequest; typedef struct VhostUserMemoryRegion { -- 2.31.1