From patchwork Tue Feb 21 18:55:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 124309 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id D3D5D41D31; Tue, 21 Feb 2023 19:56:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DCAF42D4F; Tue, 21 Feb 2023 19:56:04 +0100 (CET) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id 0A20342686 for ; Tue, 21 Feb 2023 19:56:01 +0100 (CET) Received: by mail-pl1-f179.google.com with SMTP id q5so6125932plh.9 for ; Tue, 21 Feb 2023 10:56:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EWSti6I610aY/zrXwz1fAaQCcJ+TcjQSaklsLO7Yh4Q=; b=vhOpyJr8ThOLzPEMReLKVCwbP6DADPmzqk6vt0gFmh3i80DuDRDtEcgVfJruyDY8NZ dM9e3XxwqiNXZXXkhCFBAI49jeTP3bbYs7hcEmYnTfOPS6Nra7BVLK/RpEmTGsSjxvVv rE82hct9ZBN7azEUZCb2EEm1Z4dkK3UgyeGmCD7JqEFukPszUEOC3wuA+iQW6eq4Q1X0 RM2XdL49BBQROzpp5UsTtPZ6OyKQGiOJe1t3Ue2UjFZQ5sdgmTl4GkPxtQKg+iyCkGBD /6f49gLJ6RwMRaE7PIQXPdxzvTDm3Wy5mtZzXlhjO4CVb5o1YHZ6iipq0CX/6PuJCY8D nDyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EWSti6I610aY/zrXwz1fAaQCcJ+TcjQSaklsLO7Yh4Q=; b=Bbn4nIEzxeKVN1p37s1NSA2lvF5IiUXYQGSKaDXx+e5vaLHGPdD0NF9iqTf2vIQ0oO bZ3VYSoV8zGD7/3vE4EfeRBjL5tYCs1Yi0N/Z19bzJiLKuAIZngQ10jOYQ70xqZWx2k4 n34NuBSHWuwm7oe4oX7HqqgbxMKS6TwH+zWvV7UKWy6B6XpaQyl6e62EidbbEN1iK70F f/9hkP0LfqsDHf7ulO87SMmKs4w3VR54+SlBaMhmqFEnmQ0UTvWgS2uYP1lGlG/BAFl/ kS5OdOjautIpz/PqNsTr28tKBy5+4igBnJrdfSAq4bEdmSL0cqBG/L/7UGIPx7IXmbCN 15Yw== X-Gm-Message-State: AO0yUKXM84MoCOqgy/9g3BMbiPuegm7rDpkrEC19sqkXYPBUpvdbUL8g glQByiMNYlW2bIQmCHwoLMemoJhAwsAD5ZN0Ixw= X-Google-Smtp-Source: AK7set80CG4oA+tsXhWyg6mFCy95ChE7vpqyD2jiU8Jj3Nzzpfc9xu3XikXySscqGT5NCU6XG1ODAA== X-Received: by 2002:a17:903:32cf:b0:19a:b7c0:f097 with SMTP id i15-20020a17090332cf00b0019ab7c0f097mr8176870plr.57.1677005759904; Tue, 21 Feb 2023 10:55:59 -0800 (PST) Received: from hermes.local (204-195-120-218.wavecable.com. [204.195.120.218]) by smtp.gmail.com with ESMTPSA id iz15-20020a170902ef8f00b00189c4b8ca21sm6357895plb.18.2023.02.21.10.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 10:55:59 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chenbo Xia , Maxime Coquelin Subject: [PATCH v7 4/5] vhost: use logtype instead of RTE_LOGTYPE_USER1 Date: Tue, 21 Feb 2023 10:55:52 -0800 Message-Id: <20230221185553.513432-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221185553.513432-1-stephen@networkplumber.org> References: <0230208044825.1682620-1-stephen@networkplumber.org> <20230221185553.513432-1-stephen@networkplumber.org> MIME-Version: 1.0 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 Fix instances of USER1 logtype in fdset and crypto sections. Acked-by: Chenbo Xia Reviewed-by: Maxime Coquelin Signed-off-by: Stephen Hemminger --- lib/vhost/fd_man.c | 4 ++-- lib/vhost/vhost_crypto.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/vhost/fd_man.c b/lib/vhost/fd_man.c index 1876fada3354..46037d02784e 100644 --- a/lib/vhost/fd_man.c +++ b/lib/vhost/fd_man.c @@ -10,8 +10,8 @@ #include "fd_man.h" - -#define RTE_LOGTYPE_VHOST_FDMAN RTE_LOGTYPE_USER1 +RTE_LOG_REGISTER_SUFFIX(vhost_fdset_logtype, fdset, INFO); +#define RTE_LOGTYPE_VHOST_FDMAN vhost_fdset_logtype #define FDPOLLERR (POLLERR | POLLHUP | POLLNVAL) diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c index f02bf865c349..fa49ffa07099 100644 --- a/lib/vhost/vhost_crypto.c +++ b/lib/vhost/vhost_crypto.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -16,22 +17,21 @@ #define IV_OFFSET (sizeof(struct rte_crypto_op) + \ sizeof(struct rte_crypto_sym_op)) -#ifdef RTE_LIBRTE_VHOST_DEBUG +RTE_LOG_REGISTER_SUFFIX(vhost_crypto_logtype, crypto, INFO); +#define RTE_LOGTYPE_VHOST_CRYPTO vhost_crypto_logtype + #define VC_LOG_ERR(fmt, args...) \ - RTE_LOG(ERR, USER1, "[%s] %s() line %u: " fmt "\n", \ - "Vhost-Crypto", __func__, __LINE__, ## args) + RTE_LOG(ERR, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \ + __func__, __LINE__, ## args) #define VC_LOG_INFO(fmt, args...) \ - RTE_LOG(INFO, USER1, "[%s] %s() line %u: " fmt "\n", \ - "Vhost-Crypto", __func__, __LINE__, ## args) + RTE_LOG(INFO, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \ + __func__, __LINE__, ## args) +#ifdef RTE_LIBRTE_VHOST_DEBUG #define VC_LOG_DBG(fmt, args...) \ - RTE_LOG(DEBUG, USER1, "[%s] %s() line %u: " fmt "\n", \ - "Vhost-Crypto", __func__, __LINE__, ## args) + RTE_LOG(DEBUG, VHOST_CRYPTO, "%s() line %u: " fmt "\n", \ + __func__, __LINE__, ## args) #else -#define VC_LOG_ERR(fmt, args...) \ - RTE_LOG(ERR, USER1, "[VHOST-Crypto]: " fmt "\n", ## args) -#define VC_LOG_INFO(fmt, args...) \ - RTE_LOG(INFO, USER1, "[VHOST-Crypto]: " fmt "\n", ## args) #define VC_LOG_DBG(fmt, args...) #endif