From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 40798A0518 for ; Fri, 24 Jul 2020 14:08:53 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 36A241C1C9; Fri, 24 Jul 2020 14:08:53 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id A19141C1C6 for ; Fri, 24 Jul 2020 14:08:51 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id o8so7752836wmh.4 for ; Fri, 24 Jul 2020 05:08:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+zY6GT7kBrGF9zUm5RNYQqpBV+RXgaLTvToT2AupMms=; b=KRHkIWUx0w/DIyqqa7D/VyEl8PWqWhNIW1nCL9KS1V8UGlZXGU8Y7knw9tOI9sW/v4 Z2z7C3l/2G2s5a+X6C4S8qwMWUfLRM+caTeG8LqFzUkhbp6L6rokmhkZ1IzQtZxOE/kd /LeIStPZzCSaGWgp4Vvai8iqMNTlKEH6SVmwUKkaW0kU0fThv0vKFz6X2JOj7k6O4UGZ oUnr7ZtqnbhBMNZJp0g4JRHwJKErcIqa984LsB6Z6sQHCCbU8WN6tfDArJg9a2ycf4Rm wnla+QaQVJoeHSmjkNHvmQ9xJ80/8FAfc+QxuavlGFP+Ap5vbygPzBtzaDmZuN1LUMou 3LHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+zY6GT7kBrGF9zUm5RNYQqpBV+RXgaLTvToT2AupMms=; b=hy5YF1rmTe2KjZeMRjAEzjOzvnU7a25gHUTcb3VhD2qexRW0LOMP0xik19SKA8wYGu BMJN3PrTQb/AfRhZWquNwNst0b9kmw+df7CBLqi3UyPcz9rxkzCC0KPI5NKUOgaX/K5N xSvvCNXDPHlj+9L95IuPlSd0NOuu9RXUEpcT53bpV2iLei7PJB27NUfszVoHgblHcrZq dFdk0HQ0BEWh7pTTVPg+I7LzhiywMMlYj+CBEEMjwgGgcVQS9Qq2N3xRUzQiCOMgGlJr 6I5w6JVd9Kug8QfCCXxyh8XZdbLIAWN9LMHkIXodMSvlCyAkenTfbmTR+9VK4xrigupF brpQ== X-Gm-Message-State: AOAM531LLkhAI1UyX8Mk65EtmKMM/ihv9Zqr8FJBu+6r9irOKQBDO5Yy BaJbhjLb59NAgrdX9uIdLWQ= X-Google-Smtp-Source: ABdhPJy0CdnEnDT4pPNpRyroeUjKeJqFi0kVM0yF5ygHjhom5TcAtg5w+dmt6N0+4l75Mn+ULZ85qQ== X-Received: by 2002:a7b:c84d:: with SMTP id c13mr8514319wml.170.1595592531388; Fri, 24 Jul 2020 05:08:51 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i67sm7156008wma.12.2020.07.24.05.08.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:08:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Andrew Rybchenko , dpdk stable Date: Fri, 24 Jul 2020 12:59:21 +0100 Message-Id: <20200724120030.1863487-123-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix log type for some error messages' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 9e38ba9f27d48c08b4f6276f1dcbad70ac67230c Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 2 Jul 2020 12:17:05 +0100 Subject: [PATCH] ethdev: fix log type for some error messages [ upstream commit f6ac2b06ecffa62abbc2cd6009b593604c2f3447 ] Some log macros was using 'EAL' logtype, convert them to 'ethdev'. Also fix missing EOL and fix syntax for some logs. Fixes: 214ed1acd125 ("ethdev: add iterator to match devargs input") Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs") Signed-off-by: Ferruh Yigit Reviewed-by: Andrew Rybchenko --- lib/librte_ethdev/rte_ethdev.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index c3657509c..d245cfcea 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -279,7 +279,7 @@ end: error: if (ret == -ENOTSUP) - RTE_LOG(ERR, EAL, "Bus %s does not support iterating.\n", + RTE_ETHDEV_LOG(ERR, "Bus %s does not support iterating.\n", iter->bus->name); free(devargs.args); free(bus_str); @@ -4221,7 +4221,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name, device->numa_node); if (!ethdev->data->dev_private) { - RTE_LOG(ERR, EAL, "failed to allocate private data"); + RTE_ETHDEV_LOG(ERR, + "failed to allocate private data\n"); retval = -ENOMEM; goto probe_failed; } @@ -4229,8 +4230,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name, } else { ethdev = rte_eth_dev_attach_secondary(name); if (!ethdev) { - RTE_LOG(ERR, EAL, "secondary process attach failed, " - "ethdev doesn't exist"); + RTE_ETHDEV_LOG(ERR, + "secondary process attach failed, ethdev doesn't exist\n"); return -ENODEV; } } @@ -4240,15 +4241,15 @@ rte_eth_dev_create(struct rte_device *device, const char *name, if (ethdev_bus_specific_init) { retval = ethdev_bus_specific_init(ethdev, bus_init_params); if (retval) { - RTE_LOG(ERR, EAL, - "ethdev bus specific initialisation failed"); + RTE_ETHDEV_LOG(ERR, + "ethdev bus specific initialisation failed\n"); goto probe_failed; } } retval = ethdev_init(ethdev, init_params); if (retval) { - RTE_LOG(ERR, EAL, "ethdev initialisation failed"); + RTE_ETHDEV_LOG(ERR, "ethdev initialisation failed\n"); goto probe_failed; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:53.285679999 +0100 +++ 0123-ethdev-fix-log-type-for-some-error-messages.patch 2020-07-24 12:53:48.419008919 +0100 @@ -1,14 +1,15 @@ -From f6ac2b06ecffa62abbc2cd6009b593604c2f3447 Mon Sep 17 00:00:00 2001 +From 9e38ba9f27d48c08b4f6276f1dcbad70ac67230c Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 2 Jul 2020 12:17:05 +0100 Subject: [PATCH] ethdev: fix log type for some error messages +[ upstream commit f6ac2b06ecffa62abbc2cd6009b593604c2f3447 ] + Some log macros was using 'EAL' logtype, convert them to 'ethdev'. Also fix missing EOL and fix syntax for some logs. Fixes: 214ed1acd125 ("ethdev: add iterator to match devargs input") Fixes: e489007a411c ("ethdev: add generic create/destroy ethdev APIs") -Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit Reviewed-by: Andrew Rybchenko @@ -17,10 +18,10 @@ 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c -index d06b7f9b1..5f10f2d8d 100644 +index c3657509c..d245cfcea 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c -@@ -277,7 +277,7 @@ end: +@@ -279,7 +279,7 @@ end: error: if (ret == -ENOTSUP) @@ -29,7 +30,7 @@ iter->bus->name); free(devargs.args); free(bus_str); -@@ -4230,7 +4230,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name, +@@ -4221,7 +4221,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name, device->numa_node); if (!ethdev->data->dev_private) { @@ -39,7 +40,7 @@ retval = -ENOMEM; goto probe_failed; } -@@ -4238,8 +4239,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name, +@@ -4229,8 +4230,8 @@ rte_eth_dev_create(struct rte_device *device, const char *name, } else { ethdev = rte_eth_dev_attach_secondary(name); if (!ethdev) { @@ -50,7 +51,7 @@ return -ENODEV; } } -@@ -4249,15 +4250,15 @@ rte_eth_dev_create(struct rte_device *device, const char *name, +@@ -4240,15 +4241,15 @@ rte_eth_dev_create(struct rte_device *device, const char *name, if (ethdev_bus_specific_init) { retval = ethdev_bus_specific_init(ethdev, bus_init_params); if (retval) {