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 AED75A0542 for ; Fri, 11 Nov 2022 11:34:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5B44F42D14; Fri, 11 Nov 2022 11:34:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id BB5DC4014F for ; Fri, 11 Nov 2022 11:34:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668162852; 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=xlir6LwcdgZ2XHdOURbgUVF9q5mAXOb7Er4yt6tDAc0=; b=IhS868TEMrCcEsTYmyKU+zSOqvm1Qv50vCJ6ImFaw8JcUklrVE+TNX2JMk4rMHjiT8X9Iy qbSCrzCpsz6QL8I0g4Gm4PydbYoIgeKmkmLsOXQ1CFeK5qEhEmZtQibt8gFGGSJDblHpAu 3k4pTuHQ/8vYOqkD18QeV6WTPsfkRDo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-427-7c1yebznMYOd3DgQj_g4_A-1; Fri, 11 Nov 2022 05:34:09 -0500 X-MC-Unique: 7c1yebznMYOd3DgQj_g4_A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA2CD811E81; Fri, 11 Nov 2022 10:34:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.195.104]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4073200E288; Fri, 11 Nov 2022 10:34:07 +0000 (UTC) From: Kevin Traynor To: Olivier Matz Cc: dpdk stable Subject: patch 'event/sw: fix log in self test' has been queued to stable release 21.11.3 Date: Fri, 11 Nov 2022 10:32:52 +0000 Message-Id: <20221111103337.307408-2-ktraynor@redhat.com> In-Reply-To: <20221111103337.307408-1-ktraynor@redhat.com> References: <20221111103337.307408-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/14/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/050edd6df010578e0dc23500cade9f48b0a6961e Thanks. Kevin --- >From 050edd6df010578e0dc23500cade9f48b0a6961e Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Wed, 19 Oct 2022 19:06:46 +0530 Subject: [PATCH] event/sw: fix log in self test [ upstream commit 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 ] The log should display the value, not the ID. Fixes: e21df4b062b5 ("test/eventdev: add SW xstats tests") Signed-off-by: Olivier Matz --- drivers/event/sw/sw_evdev_selftest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c index 0992687275..e513601a5b 100644 --- a/drivers/event/sw/sw_evdev_selftest.c +++ b/drivers/event/sw/sw_evdev_selftest.c @@ -1643,7 +1643,7 @@ xstats_id_reset_tests(struct test *t) } if (val != port_expected[i]) { - printf("%d: %s value incorrect, expected %"PRIu64 - " got %d\n", __LINE__, port_names[i], - port_expected[i], id); + printf("%d: %s value incorrect, expected %" PRIu64 + " got %" PRIu64 "\n", + __LINE__, port_names[i], port_expected[i], val); failed = 1; } -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 10:32:17.171748712 +0000 +++ 0002-event-sw-fix-log-in-self-test.patch 2022-11-11 10:32:16.992300438 +0000 @@ -1 +1 @@ -From 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 Mon Sep 17 00:00:00 2001 +From 050edd6df010578e0dc23500cade9f48b0a6961e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -13,2 +14,2 @@ - drivers/event/sw/sw_evdev_selftest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + drivers/event/sw/sw_evdev_selftest.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) @@ -17 +18 @@ -index 9f27d8a189..3aa8d76ca8 100644 +index 0992687275..e513601a5b 100644 @@ -20,4 +21,8 @@ -@@ -1641,5 +1641,5 @@ xstats_id_reset_tests(struct test *t) - printf("%d: %s value incorrect, expected %" PRIu64 - " got %" PRIu64 "\n", -- __LINE__, port_names[i], port_expected[i], id); +@@ -1643,7 +1643,7 @@ xstats_id_reset_tests(struct test *t) + } + if (val != port_expected[i]) { +- printf("%d: %s value incorrect, expected %"PRIu64 +- " got %d\n", __LINE__, port_names[i], +- port_expected[i], id); ++ printf("%d: %s value incorrect, expected %" PRIu64 ++ " got %" PRIu64 "\n",