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 66BA941E30; Thu, 9 Mar 2023 06:36:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EF8FB410EE; Thu, 9 Mar 2023 06:36:21 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 0C15740ED7 for ; Thu, 9 Mar 2023 06:36:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678340180; x=1709876180; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=eE82DSJCBHoXxaBtJABeuY6XjyEIkyQftDnqKRFD8PU=; b=kQAxoxP7GPxxzo2gEWuR+SllKXHTQHteK068qsk4PoUBOJCC5tR+lYJ9 iHPH8FeAdEQp04mIF5caUZEvpGaWFVJc0a2Hmt6UClUvwA/6Koghg74hY /El7RjoP2Rc9DndP4nwqyWSrzPS0X+uPC+sxxL2doeLjBEF8qSnycX7ki 9AoPLLU90yZDtInie5c6JOlz6J+ObueUGJLzWrrr82ctx2Yev3Y1lUORH xbkGgtE8IlL1B+O0Cp3Ej5nME/U3jpPU5W67tq/JUwS10cxccq81QQDRu edJzvOZcTPeDygHgnflDsBkAiAmYfy3U0VomaHS3kz1GLhXeqccW3PC2E Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10643"; a="335062076" X-IronPort-AV: E=Sophos;i="5.98,245,1673942400"; d="scan'208";a="335062076" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2023 21:36:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10643"; a="746178280" X-IronPort-AV: E=Sophos;i="5.98,245,1673942400"; d="scan'208";a="746178280" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga004.fm.intel.com with ESMTP; 08 Mar 2023 21:36:18 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 8 Mar 2023 21:36:18 -0800 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 8 Mar 2023 21:36:18 -0800 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Wed, 8 Mar 2023 21:36:18 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.105) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Wed, 8 Mar 2023 21:36:17 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PRTH8twZjV6RdRLM+OLgPXus0gtXb/lZDzlR6B4kjRnZckqJH0LCYVZKuDRdSbE3GTDWQGGnozF8yNwDgrnIafeMLFTKe68hDKox+qvJbc5Dy/M1eatXRqGNiYHKtNkuuX1gWsW15WHK0D/Hr+vG5pepJBH9eD6c2rC13lKpA4nFFDaUpbukx1zQDUWznmjydaFB9GRT84az/aivtcZtUVBni2jY+0aqykDUuDrrDWQUytYkSOyiqIlFhVraIZtWjDf4FvKOkpADaJU3nhubFoTztKRavrNgrWmjE1giOSpzetmLYIyX3u37lFC6rMHH2xV8gMHayrqnBhDRdK1vbw== 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=c6bfboXM7shJLXCN4AuUqWnS8aLWBPZVW9qCHBilUQg=; b=c3vP0mevubnWKSeLjN8rD+SfgO7i8hX/l/0oQv6EDMLMVzy3BZ9B968e9YBcTan8gW0bEUiiCkS4cxCWQlsqbwZtHOtLCT51DqEhGcRAPEtfPoXgHkFPHi21bNv9K9RAkKYMm3fHTrM4iw3NWrT/5moim15slUKzc3IMVWpDFSFch/oEcoiOD/9p9ZXRwLWtZ2n+ZX4uGsf9Ztuaia8gLvrmwqlicp8CrRojpwPJ6lMGaBA+luTvd+orIpPy8bIDaTR6+Q5EviJCc3tdhxMP1jpEKY0K5boEoaNzfpaRjuIPlH+dRxo6VKNh763T0Vd/RKY6OyHavrwShkMDukm4Ew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from SN6PR11MB3504.namprd11.prod.outlook.com (2603:10b6:805:d0::17) by DM4PR11MB8178.namprd11.prod.outlook.com (2603:10b6:8:18f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.22; Thu, 9 Mar 2023 05:36:16 +0000 Received: from SN6PR11MB3504.namprd11.prod.outlook.com ([fe80::930b:6671:e4f0:4ebc]) by SN6PR11MB3504.namprd11.prod.outlook.com ([fe80::930b:6671:e4f0:4ebc%3]) with mapi id 15.20.6156.029; Thu, 9 Mar 2023 05:36:16 +0000 From: "Xia, Chenbo" To: Nobuhiro MIKI , "maxime.coquelin@redhat.com" CC: "dev@dpdk.org" , "stephen@networkplumber.org" Subject: RE: [PATCH v2 1/2] vhost: fix constants to follow new naming convention Thread-Topic: [PATCH v2 1/2] vhost: fix constants to follow new naming convention Thread-Index: AQHZUkZz1HEAcrySKEC4zarr4VE0da7x7WfQ Date: Thu, 9 Mar 2023 05:36:15 +0000 Message-ID: References: <20230309051643.70171-1-nmiki@yahoo-corp.jp> <20230309051643.70171-2-nmiki@yahoo-corp.jp> In-Reply-To: <20230309051643.70171-2-nmiki@yahoo-corp.jp> Accept-Language: en-US, zh-CN Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN6PR11MB3504:EE_|DM4PR11MB8178:EE_ x-ms-office365-filtering-correlation-id: 428b1020-17aa-4b0b-2d46-08db206033a5 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: p3k9gaAlqhIlRiClQbi7ijLiuoh7ex+nYBuRSQCwc7HHJooSX/JDFcWo7Kmthis4Xhhyu7jn1cXFu1QIbKDfW1PIbZCfTHlNnY41QyB5Fo9CX/PiQrTBzwOgaRHHgL5EzR9w6ynEewFIJVU16O4a195fXzU6LrbogftvKyTDE+8C08Zw6bN/NzW2nvByrSBZ64v41oMUT0SUzno2JXgHyX+hkchnPJMh1DYrGMcq5KQf0VdI44E/BJarNPn0gWEqEII8PhugwbTKRpHHBdr3rFIc1IAg1TWnLYBJVuadZe7bSULC+aMxSZzJCECwODU3jElKfFD+Hos39or85xeTwqEW0i8nDqmE7t7KdVUiFYajTzGrBMrdAv2gcO3421xBo50lTBj0flJ1vWYPNuKAqETIbEhALTz52MWw19wmLiO/6l6cdGDfNXlBX+eUgMogsEhc2UGfgKZ1TcCwQidlvbAQkec0sPXXmjVvg/aYffReCMOeXcTE4a7F54643mKvkjIaZn/7mv3DrckIBGUMGtxoZSOA+GDWJ52jLmqWzUTfqBEHuD9DyoV/JR12WnRmYBgOgKfxeVHe/Y5y1k5OUjj/pbuxK/j5CRN8qrvWS0bvTzOXgDXKBgZXsdpJ+vzELj7YRq31uQVJoxTs5+ArVg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR11MB3504.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(346002)(39860400002)(136003)(396003)(376002)(366004)(451199018)(33656002)(83380400001)(82960400001)(6506007)(53546011)(186003)(26005)(7696005)(71200400001)(966005)(9686003)(41300700001)(8936002)(2906002)(52536014)(64756008)(66446008)(66476007)(66556008)(66946007)(76116006)(8676002)(86362001)(4326008)(5660300002)(38070700005)(122000001)(38100700002)(316002)(55016003)(478600001)(54906003)(110136005); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?F549HvhX/7lG6s18UluIAxSAEsqrHOX8VsQb3O0ufyEF/dBitCJHqkYnKJga?= =?us-ascii?Q?/w72Yea7obRfMFs0wrbTqKzOhmrGNq9ayEZLSn4aUg1RDq9Pf1vY8PUKs89M?= =?us-ascii?Q?/fcMNEBMglb//cyxVdGIZtos5W5rBsVJXe+dEZicBwd5DIQzV/UBf0asDIkj?= =?us-ascii?Q?86b6lYDBTFoy1AruBEx6Na82EDC1nJOvlm93Xr3nnFN5ZZQ4W96IIt7DxnU2?= =?us-ascii?Q?TlYuJYBvMqMthZxxAeSe/q3k0yBfbxKTTD0l98lkiIrXvGI8bfubTpMuw+In?= =?us-ascii?Q?pGIvCkWzY/1+6/s9tiU9WpJzXJHB9RXgWaFnWbCVpn2QWTFeoBSWZ5aUiVNW?= =?us-ascii?Q?lk2yyiw8Mz8LhoJFQ4WLOFixWxZVF7HHGBQ4aOmkO1ujtp0LcwHNTYJ6fLjN?= =?us-ascii?Q?/T/IbsjqcMNMq/XNO41jV/7RCaRzWUu43W3OjVV8IoAnD5vdRHcwb7cojT44?= =?us-ascii?Q?zNKJ9jO/qUe4kY/S1x+n2/2jkT+loQTC95rWZ7T92wVMPKnD7xJqQ8AF+oGI?= =?us-ascii?Q?jHNGSjDCNruE3uFYmGHDvWXsROghodHOPj1c+9PYzS0n1Xa+kh2XxdoHlcih?= =?us-ascii?Q?7HqRHEvZrEE1rluTDt+chaCCwLs/8fxN8g3fnwfbR7/f3mnPG1ob665jXVcH?= =?us-ascii?Q?3IAiFfpKiVxjnC7OxVBbhiNTm9WAHPVFbbem+b1hsnW2jWrdTsWOONA3P4g1?= =?us-ascii?Q?uuEqfTiMC4mRKvmy4fy4IvAfcWozzrETyqam+Gy9tk4ETr6SFTUvwLIItake?= =?us-ascii?Q?FJTWgPEIJPzJiRdKdwOmVCyX7wnc8+GFCUdj7GcJbFO9f1LLY1j36cds5u3n?= =?us-ascii?Q?XBpxI3XqZU5OoJSCSVqe4GClPRz9avTCMtKDhx7i22ydf+brUKjyEgCi6JtU?= =?us-ascii?Q?HklkwdiQkNCTkK8bL+D4VM+oi2bq6byPBnioJL/f0KLdwMcXoTTRel78whwa?= =?us-ascii?Q?+3LRzqMWgBsgkmyAMEOppO7uqRjWD0onsEStzkUPio3eMHDGICT+j0frR6Vn?= =?us-ascii?Q?QwONvZvuWiEbfixNija0h2u+Ch2PD1SpjrJDhC42xZKcRTJGB+u8lXPAYTlB?= =?us-ascii?Q?b/Eri9vOBtq+9srHTQEhczFHrHmhf+CovcdpO6Sq+YWsR40fKDFULfBlRSmi?= =?us-ascii?Q?CnC5rBHTrlhFHnKrF/EzhFH25whSBLNM0sXOIhB8+DxbjeKsvcJk27o7aidk?= =?us-ascii?Q?b7VUVez0GjBtOLYb0gkHLNZIRZKS9FGSEdz87ekS/DaJmgext2iyhVN1ITaM?= =?us-ascii?Q?GbnjJAqcMAZkrsaImsKuuX83Gh3dMOp1F2JivXDiVd3eR/B/AjNdhKvdYF4s?= =?us-ascii?Q?ur7nSNBtaOkfeOH6fo/RSZiCkFiyabVzk6a6HRpUi4GBzkzhzhgMjDEdrdQr?= =?us-ascii?Q?ouIrUSVkr8QiG8W2uTx4riw8khEPzbZeLYeiH3dGAIexwAspAbNA9oNL6LdT?= =?us-ascii?Q?YQmwEvma/JPz6uJN13PFZAkcvy46HaSunBFf61dB+4/7wpyLUU6m0YnRL1Y7?= =?us-ascii?Q?IenQ8lvZ8CHl8C5n5uIj5JQQ1TDTzTq6ki/lKdPLRfb/+wBQwAyvb7RGIkgr?= =?us-ascii?Q?lpI2upJkbz/Zx/wgF1Vhh9eCFhq1ZJPzLTdHji4u?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB3504.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 428b1020-17aa-4b0b-2d46-08db206033a5 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Mar 2023 05:36:15.7844 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 8OtHWp+6ATQtRkQz3OYd5OgDu9cy/cbazY24OAtycWH73gsvQcNnEKQe3dYO+4bFVJ0ZdK+O+y+0PB0rrnD4xQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB8178 X-OriginatorOrg: intel.com 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 > -----Original Message----- > From: Nobuhiro MIKI > Sent: Thursday, March 9, 2023 1:17 PM > To: maxime.coquelin@redhat.com; Xia, Chenbo > Cc: dev@dpdk.org; stephen@networkplumber.org; Nobuhiro MIKI corp.jp> > Subject: [PATCH v2 1/2] vhost: fix constants to follow new naming > convention >=20 > 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]. >=20 > Some type names and variable names, such as VhostUserSlaveRequest, > are still in old naming convention. But, in this patch we > only focus on constants. >=20 > [1] https://qemu-project.gitlab.io/qemu/interop/vhost-user.html >=20 > 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(-) >=20 > diff --git a/.mailmap b/.mailmap > index 8e7d78f37eef..3400241a6908 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -980,7 +980,7 @@ Nithin Dabilpuram > Nitin Saxena > 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 *vde= v, > uint64_t *features) >=20 > #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)) >=20 > #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 >=20 > -#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 >=20 > #ifndef VHOST_USER_PROTOCOL_F_CRYPTO_SESSION > @@ -96,8 +96,8 @@ extern "C" { > #define VHOST_USER_PROTOCOL_F_CONFIG 9 > #endif >=20 > -#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 >=20 > #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, fals= e) > \ > VHOST_MESSAGE_HANDLER(VHOST_USER_SET_CONFIG, vhost_user_set_config, fals= e) > \ > @@ -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 =3D 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 =3D { > .msg =3D { > - .request.slave =3D VHOST_USER_SLAVE_IOTLB_MSG, > + .request.slave =3D VHOST_USER_BACKEND_IOTLB_MSG, > .flags =3D VHOST_USER_VERSION, > .size =3D sizeof(ctx.msg.payload.iotlb), > .payload.iotlb =3D { > @@ -3334,7 +3334,7 @@ rte_vhost_slave_config_change(int vid, bool > need_reply) > { > struct vhu_msg_context ctx =3D { > .msg =3D { > - .request.slave =3D VHOST_USER_SLAVE_CONFIG_CHANGE_MSG, > + .request.slave =3D VHOST_USER_BACKEND_CONFIG_CHANGE_MSG, > .flags =3D VHOST_USER_VERSION, > .size =3D 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 =3D { > .msg =3D { > - .request.slave =3D > VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG, > + .request.slave =3D > VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG, > .flags =3D VHOST_USER_VERSION | VHOST_USER_NEED_REPLY, > .size =3D sizeof(ctx.msg.payload.area), > .payload.area =3D { > @@ -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 =3D 18, > VHOST_USER_SEND_RARP =3D 19, > VHOST_USER_NET_SET_MTU =3D 20, > - VHOST_USER_SET_SLAVE_REQ_FD =3D 21, > + VHOST_USER_SET_BACKEND_REQ_FD =3D 21, > VHOST_USER_IOTLB_MSG =3D 22, > VHOST_USER_GET_CONFIG =3D 24, > VHOST_USER_SET_CONFIG =3D 25, > @@ -63,10 +63,10 @@ typedef enum VhostUserRequest { > } VhostUserRequest; >=20 > typedef enum VhostUserSlaveRequest { > - VHOST_USER_SLAVE_NONE =3D 0, > - VHOST_USER_SLAVE_IOTLB_MSG =3D 1, > - VHOST_USER_SLAVE_CONFIG_CHANGE_MSG =3D 2, > - VHOST_USER_SLAVE_VRING_HOST_NOTIFIER_MSG =3D 3, > + VHOST_USER_BACKEND_NONE =3D 0, > + VHOST_USER_BACKEND_IOTLB_MSG =3D 1, > + VHOST_USER_BACKEND_CONFIG_CHANGE_MSG =3D 2, > + VHOST_USER_BACKEND_VRING_HOST_NOTIFIER_MSG =3D 3, > } VhostUserSlaveRequest; >=20 > typedef struct VhostUserMemoryRegion { > -- > 2.31.1 Reviewed-by: Chenbo Xia =20