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 8F424A04AF for ; Thu, 20 Aug 2020 17:34:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 86D9E1E2B; Thu, 20 Aug 2020 17:34:34 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id F41561C0BC for ; Thu, 20 Aug 2020 17:34:31 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=48PhE+qSnlIuhrsU1OECpGlnJNd9b2gqanjZOf+k9I8=; b=S1dLfYgwRDPAlErYgBOp40D1hCtAnwU9C/bFo+FYqm/6saWEBQ3akju62AetlFKw8gZGVi crh5IQ31iJttx38x7fCHfLu4pyihlpY7487EoSIcC/uESULDkccGw32093qN5sVq0wCV5p 6OQtt64bV8kwhk3PEYt42ZX9SbUNWeA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-151-OqbWGXlcMnuRqJQ5ym4ZBQ-1; Thu, 20 Aug 2020 11:34:27 -0400 X-MC-Unique: OqbWGXlcMnuRqJQ5ym4ZBQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 82FF9425D5; Thu, 20 Aug 2020 15:34:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 758DD100EBAE; Thu, 20 Aug 2020 15:34:25 +0000 (UTC) From: Kevin Traynor To: Ferruh Yigit Cc: Andrew Rybchenko , dpdk stable Date: Thu, 20 Aug 2020 16:33:22 +0100 Message-Id: <20200820153341.171927-17-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'ethdev: fix log type for some error messages' has been queued to LTS release 18.11.10 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 LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/25/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4a0112bf9c7db0c4909d43321274f2b296f2199d Thanks. Kevin. --- >From 4a0112bf9c7db0c4909d43321274f2b296f2199d 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 2929d10c22..7769b0f4bc 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -280,5 +280,5 @@ 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); @@ -3636,5 +3636,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, 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; @@ -3644,6 +3645,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, 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; } @@ -3655,6 +3656,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, 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; } @@ -3663,5 +3664,5 @@ rte_eth_dev_create(struct rte_device *device, const char *name, 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.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.499991750 +0100 +++ 0017-ethdev-fix-log-type-for-some-error-messages.patch 2020-08-20 16:26:15.804324143 +0100 @@ -1 +1 @@ -From f6ac2b06ecffa62abbc2cd6009b593604c2f3447 Mon Sep 17 00:00:00 2001 +From 4a0112bf9c7db0c4909d43321274f2b296f2199d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f6ac2b06ecffa62abbc2cd6009b593604c2f3447 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index d06b7f9b1a..5f10f2d8d2 100644 +index 2929d10c22..7769b0f4bc 100644 @@ -23 +24 @@ -@@ -278,5 +278,5 @@ end: +@@ -280,5 +280,5 @@ end: @@ -30 +31 @@ -@@ -4231,5 +4231,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, +@@ -3636,5 +3636,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, @@ -38 +39 @@ -@@ -4239,6 +4240,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, +@@ -3644,6 +3645,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, @@ -47 +48 @@ -@@ -4250,6 +4251,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, +@@ -3655,6 +3656,6 @@ rte_eth_dev_create(struct rte_device *device, const char *name, @@ -56 +57 @@ -@@ -4258,5 +4259,5 @@ rte_eth_dev_create(struct rte_device *device, const char *name, +@@ -3663,5 +3664,5 @@ rte_eth_dev_create(struct rte_device *device, const char *name,