From patchwork Mon Aug 14 16:31:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 130288 X-Patchwork-Delegate: david.marchand@redhat.com 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 6A24243066; Mon, 14 Aug 2023 18:32:10 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C1905432C2; Mon, 14 Aug 2023 18:31:43 +0200 (CEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mails.dpdk.org (Postfix) with ESMTP id 0ADBA432B3 for ; Mon, 14 Aug 2023 18:31:41 +0200 (CEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1bdef6f5449so4760325ad.3 for ; Mon, 14 Aug 2023 09:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20221208.gappssmtp.com; s=20221208; t=1692030700; x=1692635500; 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=r4IBdO8mPpieUT+GGcwBMGKGXQaP8S3fRp5Hn0gKuIE=; b=ixvFQ1u4lzSyYIYrO6fe+A4KFVaOGwNkxVpmyfJsDvuQwK4dQEtemEksQNDMJH5SoD Amw0k4EyvVvF1750X3wRnrc0C//oIZfLk6QDJcO9TL6WdR+aGb13vg5oR4WjkAGhNc5H tigfSdwf3iZ5sSuIbbXtCFSlwz35vlNCg/WFUlGpFB2RxNSqKx80MJIbI6RF9UDjskSK C3YCJrddlYB1qd12DJllCd2YpibUbvNKSUMK6HgDZbdkANaV97X9xgEi3n/i3+BCvtaY 7GzdWGIZTNkxnv3u6kDo/FcagRNyRmlhZbP1inHLd2xFSqnXMyyEaeB6tfGTdyMmBOXz 9JrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692030700; x=1692635500; 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=r4IBdO8mPpieUT+GGcwBMGKGXQaP8S3fRp5Hn0gKuIE=; b=is6UaJ3Vcy1WxsyrzeWCl7h8WsMGIcYqbEIT7zOfua2gN0Stz5fUFcxLQmqAx9g1RK CfhgtQ558YGllaqWqmEaG5uVLJkkMxlzgi9aeJQ8myxK0zBldfWtbmDOOAmR8aeHBf1u 0ZWTe+I+Q9W+88g8elcCxA9tT8OIX3vXHHF1XkNKYc8iCSu4ysGnQ+R8eRVeAMk+drqb QfxxSEFLpHlxgS69Aa0fqfZ45na/vArxSSxZlZfpc8BDteuNOnXoNIHXeIO7oA6UufKJ Ry6dHE+7IlRM0LtJiVM5BAvVT3bhwlYlv3zcFcy+T2D3sK+WI73mqK42PTKk4cpyhy7O pwEQ== X-Gm-Message-State: AOJu0Yxk5qnkNPXMSK85Fgof+m/+JO+8iYKorkJgryqFtcCu3MP3NnuQ AU0mz5zjfimFaUXx6OzVonvsolB3QjHSgmZ0hizg4ObNKSY= X-Google-Smtp-Source: AGHT+IGaQ12TWP9gRj87dOR6PQjvAONSYF2Xjnpt7qT3LY8D5VnOnpPyJdQED+aSJBp4qtFDvej81g== X-Received: by 2002:a17:902:7798:b0:1b8:94f4:3e0 with SMTP id o24-20020a170902779800b001b894f403e0mr10907193pll.14.1692030699975; Mon, 14 Aug 2023 09:31:39 -0700 (PDT) Received: from hermes.local (204-195-127-207.wavecable.com. [204.195.127.207]) by smtp.gmail.com with ESMTPSA id t10-20020a170902bc4a00b001bdd51748f8sm3892743plz.271.2023.08.14.09.31.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 09:31:39 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Chenbo Xia , Maxime Coquelin Subject: [PATCH v8 4/6] vhost: use logtype instead of RTE_LOGTYPE_USER1 Date: Mon, 14 Aug 2023 09:31:23 -0700 Message-Id: <20230814163125.63033-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230814163125.63033-1-stephen@networkplumber.org> References: <20230208044825.1682620-1-stephen@networkplumber.org> <20230814163125.63033-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 9bf5ef67b9ad..3e1ef1ac25eb 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