Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/124868/?format=api
{ "id": 124868, "url": "https://patches.dpdk.org/api/patches/124868/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230309020721.22164-3-nmiki@yahoo-corp.jp/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230309020721.22164-3-nmiki@yahoo-corp.jp>", "list_archive_url": "https://inbox.dpdk.org/dev/20230309020721.22164-3-nmiki@yahoo-corp.jp", "date": "2023-03-09T02:07:21", "name": "[2/2] vhost: refactor to follow new naming convention", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "cdbc3eb42259cb850a6136a30d978262bd0c9660", "submitter": { "id": 2445, "url": "https://patches.dpdk.org/api/people/2445/?format=api", "name": "Nobuhiro MIKI", "email": "nmiki@yahoo-corp.jp" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230309020721.22164-3-nmiki@yahoo-corp.jp/mbox/", "series": [ { "id": 27290, "url": "https://patches.dpdk.org/api/series/27290/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=27290", "date": "2023-03-09T02:07:21", "name": "vhost: fix names to follow new naming convention", "version": 1, "mbox": "https://patches.dpdk.org/series/27290/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/124868/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/124868/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id C239341E34;\n\tThu, 9 Mar 2023 03:07:44 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9F1E240ED7;\n\tThu, 9 Mar 2023 03:07:44 +0100 (CET)", "from corp-ob07.yahoo-corp.jp (corp-ob07.yahoo-corp.jp\n [183.79.94.94])\n by mails.dpdk.org (Postfix) with ESMTP id 730E1410EE\n for <dev@dpdk.org>; Thu, 9 Mar 2023 03:07:42 +0100 (CET)", "from JPN01-TYC-obe.outbound.protection.outlook.com\n (mail-tycjpn01lp2177.outbound.protection.outlook.com [104.47.23.177])\n by corp-ob07.yahoo-corp.jp (Postfix) with ESMTPS id 20CE619FB187;\n Thu, 9 Mar 2023 11:07:41 +0900 (JST)", "from TY2PR01MB4107.jpnprd01.prod.outlook.com (2603:1096:404:d8::23)\n by OS3PR01MB9914.jpnprd01.prod.outlook.com (2603:1096:604:1ee::12)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.18; Thu, 9 Mar\n 2023 02:07:39 +0000", "from TY2PR01MB4107.jpnprd01.prod.outlook.com\n ([fe80::61fe:e4c3:a819:6ce6]) by TY2PR01MB4107.jpnprd01.prod.outlook.com\n ([fe80::61fe:e4c3:a819:6ce6%7]) with mapi id 15.20.6178.019; Thu, 9 Mar 2023\n 02:07:39 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=JB54cr5t5HQMowUtPRzqht9HXOBo/4PwWRn73eGigwX0znCN2WSMt0nkZ7c5Wx2ZzaUfD06SCHgQ55yV3/oReW/UQgIhzTBHtzp25hDPSgIVgLzWwhBhDUnK4xVrzh/4xMb5g3sCR/aJ8BAinlgs5FiLPdyo4LnhalniGgbDzQ57i1pJ92WvltE73MvtxvWXYq7eK7BLR6Zot2ArnnNxXng3LvPBROlPT6AuCKwMen8gpB3yHeUpymTsjsJIu63ldvKtyRLH8FoWjSYPt4xl8bNIHMBhdRipm8QNaQ6getRJmGtLyw6tRorq6Va5nGjKpwAK+YgvSKv69HKBka5Yrg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n 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;\n bh=90Ak4xau+rtlgLsW1hDPH4y9nE9FRfAX5xwLC7kHA3Q=;\n b=XsyIHsUhJw7360OOqxM17nG8N0sKqCe85YErtIqxJentPXdFKi6NPKMeeVqhY6mG+GJ8My7alifP4aYnkUqsQWZG/dvtACcI82+leeNW7WREK+PITz8GnQL7efaLaDIiC1WoSCywDWT4xdJ1y01OHD8w1qUzUKGjZt8pCNLnK1ORGLzNQbPos3RA27yRyVxrN646PN0MWj6miTlm9e+6fJZNrqQmBmx/V3gf4ygOXzjiigVVaBrcoYFBnhai6vQCBkepub8gIeW4L7o0aJV6rGDZMrtD+EuW1mCS5KxiojXA0ceTiVXSuXkwku3zbSfDnQihHJtHmitwDETbHr5RpQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=yahoo-corp.jp; dmarc=pass action=none\n 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;\n s=selector1;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=90Ak4xau+rtlgLsW1hDPH4y9nE9FRfAX5xwLC7kHA3Q=;\n b=KYQEZzqEfZTCQdMMQfIzBoeqJbbAKI0UUscEsBni6G/p+EmHMocs6DEVggQYLs8+EDWL0tzjb7UPV8Pon0rL7N6/UvRA020SBSwWXIMctEowPYYPMnCs315PIQ40mLt//dICUS/8Yu0RHB1+PV9xHwb+cx11OZ0ePeaUFJhBum8=", "Authentication-Results": "dkim=none (message not signed)\n header.d=none;dmarc=none action=none header.from=yahoo-corp.jp;", "From": "Nobuhiro MIKI <nmiki@yahoo-corp.jp>", "To": "maxime.coquelin@redhat.com,\n\tchenbo.xia@intel.com", "Cc": "dev@dpdk.org,\n\tNobuhiro MIKI <nmiki@yahoo-corp.jp>", "Subject": "[PATCH 2/2] vhost: refactor to follow new naming convention", "Date": "Thu, 9 Mar 2023 11:07:21 +0900", "Message-Id": "<20230309020721.22164-3-nmiki@yahoo-corp.jp>", "X-Mailer": "git-send-email 2.38.1", "In-Reply-To": "<20230309020721.22164-1-nmiki@yahoo-corp.jp>", "References": "<20230309020721.22164-1-nmiki@yahoo-corp.jp>", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-ClientProxiedBy": "TYAPR01CA0080.jpnprd01.prod.outlook.com\n (2603:1096:404:2c::20) To TY2PR01MB4107.jpnprd01.prod.outlook.com\n (2603:1096:404:d8::23)", "MIME-Version": "1.0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "TY2PR01MB4107:EE_|OS3PR01MB9914:EE_", "X-MS-Office365-Filtering-Correlation-Id": "6114486d-4494-4a0b-97d9-08db20430f1e", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n qCxJ4r0y1HcATqvNksWXSMrSXmnfvXzE75zKY9fMZ9KjoN2rLLvMnCRg3PXBm4HKW08a3nUxoSSa716OYZLhpdTW6JK1C2XcDyI8h/6GexMIcZwl8DtXwegu+TH0qMtJt1mIUvxc5mZ/uVuW1jM8MJQlqEWk+ek0KYv96iMpJ7FA5WECT4r0EPpA7bNGntmnE3Wom6hgyS4Yn42ZckLeXwE7f2yKeniRIQizBdU/lRv8AvBv3ht7xste63OUWAsaI7LL4enxxE8HAoi7roQgQjM0wpauI9Azm0Ekvml3QucchRIJh5RSqFezInclbveozTU4Fi4hiwJ+tUvpJxb8nuNvfA6ebqqSVf++Hr/7jwLCzlt1N9kOW+hQDV1j0nk1caFvSyn1+nfmcRVTUbvjvFzA18NeIym0zRLreBM2xBPII8CW24ecygQGVi4rMG7fA928BZaIXvUd5X6WTIRd3Vdv7EXQrajKMwWQzSzqhfPe+dBaMEiafVFn6C4EjZxedFifMuEXv87nKOJ/9/qJm9dxBuHmygQcVZRYnP3LFKA4flmxsCxBFZuFt9Aq/hckIqP1gHxZeo0PQbF3R6gi5MD1XR6oL08lym0p3QPPTysQGscVI1N9ICU0/pc1mBm8zZS+hV9BS9iE83yVJRF8RMUlmC6jWskLJm+aRce6TRT7dd9c9lGozcZvbp+lzwd6VX/GdNrP3TV4gKQ9XJMvRNqULW5Ln7DWq1z4Rv1n3x+BF4Wa45bDOGqmE+QkSUYC", "X-Forefront-Antispam-Report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:TY2PR01MB4107.jpnprd01.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230025)(4636009)(39860400002)(366004)(346002)(136003)(396003)(376002)(451199018)(107886003)(6666004)(2616005)(4326008)(8676002)(66946007)(66556008)(66476007)(86362001)(6486002)(52116002)(5660300002)(316002)(36756003)(38350700002)(2906002)(38100700002)(83380400001)(82960400001)(8936002)(186003)(41300700001)(478600001)(1076003)(6506007)(6512007)(26005);\n DIR:OUT; SFP:1102;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n EVDGNyDMeJNhQVzKIW7ZoFJgIAz0asMlbW/3xk7CdVjtob5OsdPs3Y/M+WjxU2cdRRe1UWhaVfv3yYCoZJPzdtXHzPsk/+Oy1E2tImiwLMXTWc8+wCm5f7dFGRAj6XjlBF4ZA2WyrCC5y7u817VBzU/9SK1+eHImhZ6oP5C6l1DQrW8ZRKwTgEo9BMNblELCxgsyq+v9+PR4RdiysULrsRDz9c7UqXSATixqB8f7djq11QaZyVvbpHsM7gYkiGDA/p+BDUOOSXaXebu9BNMbyoNBJPjGkVrfbzfTOxylj2P+A5p8nPZ24H2oDju6hAqY9685swIHlNiIE2XU/f5ajTyG1iUUSaBmlz0W780MKeNLhswpyZrLxfaeLBoqilkav2JvhcIwnzdi1DWV+xqrlLQAYLSQ8hpgCd2mbsrIagkAzytsWqmdwFFK2rL02/+h8XBcFPs/suTsAo1KEsVOsuGL/6eXgObYrx29KLva2LwOo3d+fBMS12Or+pUgRSQn9+poV+9nLwfzmYJJgD6iE8htRDkjj/bU2nqqpTaFsHwUblnICOZuCKBpV+gBv2SFzGPuHC7LbuHzleFN52p0CufpjVkfUo8PVQsR2jyegM3JLqtu8MNH+eub43xoqQW31604DqZ8xM1rJlSSaUDh2WR5E0ifNs6c1hW76q1TCCc12x0BFTfR3i7W9dqnM4vawhQxosN86Xx/u8aHcIyw6MUGEvaxvIRT8C/BHO3uqh17sRlQYHe+6KVfvN/7AZ34VcEcya66amrvELCUrm+Eet1SC696HT9QhtMREF9jNv9c+/J2SmF0z7UJCqyROkO0u9G+q8q1qel+gW1kN2SbDlzQ0OZYYBgD3ggFxQ95AgH7RtXRPNbw+2ZQDXfZGpoZl560fwYx8fP/pXdI529xCImYVN7wBtHtj2mac7H00G9NQGcAIxNZnER0t6ST8XieY7FpF4Xg+bWV8eBA6uBb2dHmdHKkeikoQbjtuWZc3NWLcWBEbMcGUK67Gh3Gs52kI+dUWzTcxaVTAQm01LTZuMVk3gWta18iPcLcR38a1WyQK9j4WbVIe5tLNO9DMHDeRJUu1BiNZcvb+6lPlgnrXGTqhMwlp+pMWgIMhpzbyULjZBjDRxf0v/n4hlaF0SmrSz3tuApRcIWO9zsP471JcIcxwJ95fxPcp6HF4PuRjE87DvQqP8JWEPscGSSvS7kNP3I6xB/hB2c2E1NWipjTDn8Yy+Xa1v/bUNWnq24PG+a1xK+FPM7rM8Je8B1PyyE9NJARdwDLmH+V7slkoGsEJTItY49zaLgO2Cmz4SdSvbqCYkvQmHheI6hkGrYWefNNs6fEFypjjvCAKhLuOQrprKl+K6ZAgPKpJK8FAnuex7lfZXCdatC5zvMehEOEJSJzZtzvMvYgOdOOvnkAxQGYM5QYUhTQ7uCKI2/VCVmIGARRvhoiCoURln9iHI+2/EI97Z2i88c0nSyHYI6BmlYtlTzh3MVr613//3SWsg9fHypO/26swbfKxBDINaA5BdHO/kKTyhKFTya/15zbSylJ7ApCkeSqAd5cauUoY54ytetOz7Iwx1rsdRqufAwQAzX5", "X-OriginatorOrg": "yahoo-corp.jp", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 6114486d-4494-4a0b-97d9-08db20430f1e", "X-MS-Exchange-CrossTenant-AuthSource": "TY2PR01MB4107.jpnprd01.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "09 Mar 2023 02:07:39.4586 (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": "\n sf15yTkuYkunTqS5rn2CVIS6Q7npZEz5rjk8FFcZha2aKVZg7MYLNrXmRlyDPbgiX0KGJTzteFQiBoVNwP6VRg==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "OS3PR01MB9914", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Simply replace '_slave_' with '_backend_'.\n\nSigned-off-by: Nobuhiro MIKI <nmiki@yahoo-corp.jp>\n---\n drivers/vdpa/ifc/ifcvf_vdpa.c | 2 +-\n lib/vhost/rte_vhost.h | 2 +-\n lib/vhost/version.map | 2 +-\n lib/vhost/vhost.c | 4 +--\n lib/vhost/vhost.h | 4 +--\n lib/vhost/vhost_user.c | 62 +++++++++++++++++------------------\n lib/vhost/vhost_user.h | 6 ++--\n 7 files changed, 41 insertions(+), 41 deletions(-)", "diff": "diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c\nindex fe4d278c5380..e4133568c1aa 100644\n--- a/drivers/vdpa/ifc/ifcvf_vdpa.c\n+++ b/drivers/vdpa/ifc/ifcvf_vdpa.c\n@@ -605,7 +605,7 @@ virtio_interrupt_handler(struct ifcvf_internal *internal)\n \tint vid = internal->vid;\n \tint ret;\n \n-\tret = rte_vhost_slave_config_change(vid, 1);\n+\tret = rte_vhost_backend_config_change(vid, 1);\n \tif (ret)\n \t\tDRV_LOG(ERR, \"failed to notify the guest about configuration space change.\");\n }\ndiff --git a/lib/vhost/rte_vhost.h b/lib/vhost/rte_vhost.h\nindex ed255fc6c51f..cc2ec99c315c 100644\n--- a/lib/vhost/rte_vhost.h\n+++ b/lib/vhost/rte_vhost.h\n@@ -1066,7 +1066,7 @@ rte_vhost_get_vdpa_device(int vid);\n */\n __rte_experimental\n int\n-rte_vhost_slave_config_change(int vid, bool need_reply);\n+rte_vhost_backend_config_change(int vid, bool need_reply);\n \n /**\n * Retrieve names of statistics of a Vhost virtqueue.\ndiff --git a/lib/vhost/version.map b/lib/vhost/version.map\nindex d779a5cf3a0a..d322a4a888cd 100644\n--- a/lib/vhost/version.map\n+++ b/lib/vhost/version.map\n@@ -68,7 +68,7 @@ EXPERIMENTAL {\n \tglobal:\n \n \trte_vhost_crypto_driver_start;\n-\trte_vhost_slave_config_change;\n+\trte_vhost_backend_config_change;\n \trte_vhost_async_channel_register;\n \trte_vhost_async_channel_unregister;\n \trte_vhost_submit_enqueue_burst;\ndiff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c\nindex 358672bb176b..ef3794381751 100644\n--- a/lib/vhost/vhost.c\n+++ b/lib/vhost/vhost.c\n@@ -701,9 +701,9 @@ vhost_new_device(void)\n \n \tdev->vid = i;\n \tdev->flags = VIRTIO_DEV_BUILTIN_VIRTIO_NET;\n-\tdev->slave_req_fd = -1;\n+\tdev->backend_req_fd = -1;\n \tdev->postcopy_ufd = -1;\n-\trte_spinlock_init(&dev->slave_req_lock);\n+\trte_spinlock_init(&dev->backend_req_lock);\n \n \treturn i;\n }\ndiff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h\nindex a31d810531d7..8fdab13c7097 100644\n--- a/lib/vhost/vhost.h\n+++ b/lib/vhost/vhost.h\n@@ -499,8 +499,8 @@ struct virtio_net {\n \tuint32_t\t\tmax_guest_pages;\n \tstruct guest_page *guest_pages;\n \n-\tint\t\t\tslave_req_fd;\n-\trte_spinlock_t\t\tslave_req_lock;\n+\tint\t\t\tbackend_req_fd;\n+\trte_spinlock_t\t\tbackend_req_lock;\n \n \tint\t\t\tpostcopy_ufd;\n \tint\t\t\tpostcopy_listening;\ndiff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c\nindex cd4104ea5ce0..1ce1a5924f74 100644\n--- a/lib/vhost/vhost_user.c\n+++ b/lib/vhost/vhost_user.c\n@@ -226,9 +226,9 @@ vhost_backend_cleanup(struct virtio_net *dev)\n \t\tdev->inflight_info = NULL;\n \t}\n \n-\tif (dev->slave_req_fd >= 0) {\n-\t\tclose(dev->slave_req_fd);\n-\t\tdev->slave_req_fd = -1;\n+\tif (dev->backend_req_fd >= 0) {\n+\t\tclose(dev->backend_req_fd);\n+\t\tdev->backend_req_fd = -1;\n \t}\n \n \tif (dev->postcopy_ufd >= 0) {\n@@ -2257,11 +2257,11 @@ vhost_user_set_protocol_features(struct virtio_net **pdev,\n {\n \tstruct virtio_net *dev = *pdev;\n \tuint64_t protocol_features = ctx->msg.payload.u64;\n-\tuint64_t slave_protocol_features = 0;\n+\tuint64_t backend_protocol_features = 0;\n \n \trte_vhost_driver_get_protocol_features(dev->ifname,\n-\t\t\t&slave_protocol_features);\n-\tif (protocol_features & ~slave_protocol_features) {\n+\t\t\t&backend_protocol_features);\n+\tif (protocol_features & ~backend_protocol_features) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"received invalid protocol features.\\n\");\n \t\treturn RTE_VHOST_MSG_RESULT_ERR;\n \t}\n@@ -2458,14 +2458,14 @@ vhost_user_set_req_fd(struct virtio_net **pdev,\n \n \tif (fd < 0) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n-\t\t\t\"invalid file descriptor for slave channel (%d)\\n\", fd);\n+\t\t\t\"invalid file descriptor for backend channel (%d)\\n\", fd);\n \t\treturn RTE_VHOST_MSG_RESULT_ERR;\n \t}\n \n-\tif (dev->slave_req_fd >= 0)\n-\t\tclose(dev->slave_req_fd);\n+\tif (dev->backend_req_fd >= 0)\n+\t\tclose(dev->backend_req_fd);\n \n-\tdev->slave_req_fd = fd;\n+\tdev->backend_req_fd = fd;\n \n \treturn RTE_VHOST_MSG_RESULT_OK;\n }\n@@ -2931,46 +2931,46 @@ send_vhost_reply(struct virtio_net *dev, int sockfd, struct vhu_msg_context *ctx\n }\n \n static int\n-send_vhost_slave_message(struct virtio_net *dev, struct vhu_msg_context *ctx)\n+send_vhost_backend_message(struct virtio_net *dev, struct vhu_msg_context *ctx)\n {\n-\treturn send_vhost_message(dev, dev->slave_req_fd, ctx);\n+\treturn send_vhost_message(dev, dev->backend_req_fd, ctx);\n }\n \n static int\n-send_vhost_slave_message_process_reply(struct virtio_net *dev, struct vhu_msg_context *ctx)\n+send_vhost_backend_message_process_reply(struct virtio_net *dev, struct vhu_msg_context *ctx)\n {\n \tstruct vhu_msg_context msg_reply;\n \tint ret;\n \n-\trte_spinlock_lock(&dev->slave_req_lock);\n-\tret = send_vhost_slave_message(dev, ctx);\n+\trte_spinlock_lock(&dev->backend_req_lock);\n+\tret = send_vhost_backend_message(dev, ctx);\n \tif (ret < 0) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"failed to send config change (%d)\\n\", ret);\n \t\tgoto out;\n \t}\n \n-\tret = read_vhost_message(dev, dev->slave_req_fd, &msg_reply);\n+\tret = read_vhost_message(dev, dev->backend_req_fd, &msg_reply);\n \tif (ret <= 0) {\n \t\tif (ret < 0)\n \t\t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n-\t\t\t\t\"vhost read slave message reply failed\\n\");\n+\t\t\t\t\"vhost read backend message reply failed\\n\");\n \t\telse\n \t\t\tVHOST_LOG_CONFIG(dev->ifname, INFO, \"vhost peer closed\\n\");\n \t\tret = -1;\n \t\tgoto out;\n \t}\n \n-\tif (msg_reply.msg.request.slave != ctx->msg.request.slave) {\n+\tif (msg_reply.msg.request.backend != ctx->msg.request.backend) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n \t\t\t\"received unexpected msg type (%u), expected %u\\n\",\n-\t\t\tmsg_reply.msg.request.slave, ctx->msg.request.slave);\n+\t\t\tmsg_reply.msg.request.backend, ctx->msg.request.backend);\n \t\tret = -1;\n \t\tgoto out;\n \t}\n \n \tret = msg_reply.msg.payload.u64 ? -1 : 0;\n out:\n-\trte_spinlock_unlock(&dev->slave_req_lock);\n+\trte_spinlock_unlock(&dev->backend_req_lock);\n \treturn ret;\n }\n \n@@ -3307,7 +3307,7 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)\n \tint ret;\n \tstruct vhu_msg_context ctx = {\n \t\t.msg = {\n-\t\t\t.request.slave = VHOST_USER_BACKEND_IOTLB_MSG,\n+\t\t\t.request.backend = VHOST_USER_BACKEND_IOTLB_MSG,\n \t\t\t.flags = VHOST_USER_VERSION,\n \t\t\t.size = sizeof(ctx.msg.payload.iotlb),\n \t\t\t.payload.iotlb = {\n@@ -3318,7 +3318,7 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)\n \t\t},\n \t};\n \n-\tret = send_vhost_message(dev, dev->slave_req_fd, &ctx);\n+\tret = send_vhost_message(dev, dev->backend_req_fd, &ctx);\n \tif (ret < 0) {\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR,\n \t\t\t\"failed to send IOTLB miss message (%d)\\n\",\n@@ -3330,11 +3330,11 @@ vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm)\n }\n \n int\n-rte_vhost_slave_config_change(int vid, bool need_reply)\n+rte_vhost_backend_config_change(int vid, bool need_reply)\n {\n \tstruct vhu_msg_context ctx = {\n \t\t.msg = {\n-\t\t\t.request.slave = VHOST_USER_BACKEND_CONFIG_CHANGE_MSG,\n+\t\t\t.request.backend = VHOST_USER_BACKEND_CONFIG_CHANGE_MSG,\n \t\t\t.flags = VHOST_USER_VERSION,\n \t\t\t.size = 0,\n \t\t}\n@@ -3347,10 +3347,10 @@ rte_vhost_slave_config_change(int vid, bool need_reply)\n \t\treturn -ENODEV;\n \n \tif (!need_reply) {\n-\t\tret = send_vhost_slave_message(dev, &ctx);\n+\t\tret = send_vhost_backend_message(dev, &ctx);\n \t} else {\n \t\tctx.msg.flags |= VHOST_USER_NEED_REPLY;\n-\t\tret = send_vhost_slave_message_process_reply(dev, &ctx);\n+\t\tret = send_vhost_backend_message_process_reply(dev, &ctx);\n \t}\n \n \tif (ret < 0)\n@@ -3358,7 +3358,7 @@ rte_vhost_slave_config_change(int vid, bool need_reply)\n \treturn ret;\n }\n \n-static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,\n+static int vhost_user_backend_set_vring_host_notifier(struct virtio_net *dev,\n \t\t\t\t\t\t int index, int fd,\n \t\t\t\t\t\t uint64_t offset,\n \t\t\t\t\t\t uint64_t size)\n@@ -3366,7 +3366,7 @@ static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,\n \tint ret;\n \tstruct vhu_msg_context ctx = {\n \t\t.msg = {\n-\t\t\t.request.slave = VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG,\n+\t\t\t.request.backend = VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG,\n \t\t\t.flags = VHOST_USER_VERSION | VHOST_USER_NEED_REPLY,\n \t\t\t.size = sizeof(ctx.msg.payload.area),\n \t\t\t.payload.area = {\n@@ -3384,7 +3384,7 @@ static int vhost_user_slave_set_vring_host_notifier(struct virtio_net *dev,\n \t\tctx.fd_num = 1;\n \t}\n \n-\tret = send_vhost_slave_message_process_reply(dev, &ctx);\n+\tret = send_vhost_backend_message_process_reply(dev, &ctx);\n \tif (ret < 0)\n \t\tVHOST_LOG_CONFIG(dev->ifname, ERR, \"failed to set host notifier (%d)\\n\", ret);\n \n@@ -3444,7 +3444,7 @@ int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable)\n \t\t\t\tgoto disable;\n \t\t\t}\n \n-\t\t\tif (vhost_user_slave_set_vring_host_notifier(dev, i,\n+\t\t\tif (vhost_user_backend_set_vring_host_notifier(dev, i,\n \t\t\t\t\tvfio_device_fd, offset, size) < 0) {\n \t\t\t\tret = -EFAULT;\n \t\t\t\tgoto disable;\n@@ -3453,7 +3453,7 @@ int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable)\n \t} else {\n disable:\n \t\tfor (i = q_start; i <= q_last; i++) {\n-\t\t\tvhost_user_slave_set_vring_host_notifier(dev, i, -1,\n+\t\t\tvhost_user_backend_set_vring_host_notifier(dev, i, -1,\n \t\t\t\t\t0, 0);\n \t\t}\n \t}\ndiff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h\nindex 8e418414ba94..cd8610129789 100644\n--- a/lib/vhost/vhost_user.h\n+++ b/lib/vhost/vhost_user.h\n@@ -62,12 +62,12 @@ typedef enum VhostUserRequest {\n \tVHOST_USER_GET_STATUS = 40,\n } VhostUserRequest;\n \n-typedef enum VhostUserSlaveRequest {\n+typedef enum VhostUserBackendRequest {\n \tVHOST_USER_BACKEND_NONE = 0,\n \tVHOST_USER_BACKEND_IOTLB_MSG = 1,\n \tVHOST_USER_BACKEND_CONFIG_CHANGE_MSG = 2,\n \tVHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG = 3,\n-} VhostUserSlaveRequest;\n+} VhostUserBackendRequest;\n \n typedef struct VhostUserMemoryRegion {\n \tuint64_t guest_phys_addr;\n@@ -137,7 +137,7 @@ struct vhost_user_config {\n typedef struct VhostUserMsg {\n \tunion {\n \t\tuint32_t master; /* a VhostUserRequest value */\n-\t\tuint32_t slave; /* a VhostUserSlaveRequest value*/\n+\t\tuint32_t backend; /* a VhostUserBackendRequest value*/\n \t} request;\n \n #define VHOST_USER_VERSION_MASK 0x3\n", "prefixes": [ "2/2" ] }