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 A3DC6A0544 for ; Fri, 11 Nov 2022 12:41:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A06FB42D0E; Fri, 11 Nov 2022 12:41:19 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id CA41640141 for ; Fri, 11 Nov 2022 12:41:17 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B6FB03F0C8 for ; Fri, 11 Nov 2022 11:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1668166874; bh=7soiMjdLBjwHzSJEMzO0swcbvdtwckfpg+U2ND071sc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=VK+ZXLA4rALoN9IGUlYnaOGs5WVVJMae0iF3pARQBgSoKklHqGDdX3cmb//4cMp6V bVQqL7fH58uiUmPhevpvSsdlO5lVS7w8jHEBO1PheNcdI96a9CAl2Lomo/6IiliG89 kiRuCMe8TG5TQlJ3j0zotdmYddkFdXmWdt91XZEf5X1h+RsK8pMYS6qH10ZAufVzw7 mGEc7rx8wUrhSMjlnqRZZzAtZI7dE+uHqKtur3pzAp1wJxAhkYzM11s2yeX8dWsB42 2xfR+BO5Xc/I9Eys0u+IZT+6GKB8ZCWOxiMqQA60jUAfJBf6yt4dxdxtYagN4rs0Jn z7fVgd68gWqOA== Received: by mail-ed1-f70.google.com with SMTP id c9-20020a05640227c900b00463de74bc15so3470232ede.13 for ; Fri, 11 Nov 2022 03:41:14 -0800 (PST) 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=7soiMjdLBjwHzSJEMzO0swcbvdtwckfpg+U2ND071sc=; b=EtGlHiSiVCMV6aKxyK7XUaWZeh6j2r/rbmSEUfaCyze4PZBvG9zr6QRSbAnPgiW28p FBqBh6S6YbiX6KvtRbYzkh+wB47g0w8kJrzNO5rsLtHzLrvnTIKAUoMxyM4iQVDGu140 +ULSQoozDuHL5YdqeIbA0FGPn/YS/QTzwbeHa+DiGmIV2HHb6oG0WcPuUDwRknfT0ZF7 n2rZdkK0TPjq1wJjIpg9FMv2mi7XI3CXnykDkSZs5pH5ifmYY8Rq/SMwDipkw3vhK3u5 uzqaakl7phFwWKIrKdLMaJk1GMLwPfGm3N3KyyCzaZwhlU8XJyPuGmuJNAvEOo0EbQ41 M8Hg== X-Gm-Message-State: ANoB5pn/CNQ42ztQZVv1Mkefl1XCx6ihNeEhTl4nO9dZF4OBIz/4Zoln AOg2r5IV0nKO2xaWUbcFUKlEChcnKDmdHER1EsiHAGBZWfSyiFUDdlG5Q1fubzxabWyZvG64AF+ voTwuduJbspRdZ4n8fE4RI1u+ X-Received: by 2002:a50:9352:0:b0:461:7a4f:6392 with SMTP id n18-20020a509352000000b004617a4f6392mr1132322eda.107.1668166874288; Fri, 11 Nov 2022 03:41:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf6HVaLt/y3gC7Bm6FhIGydxI5SNZFugGAVTEAD+W+Xvq1oQX0cSHAMD9DFEfkduyOSwyvWoeg== X-Received: by 2002:a50:9352:0:b0:461:7a4f:6392 with SMTP id n18-20020a509352000000b004617a4f6392mr1132305eda.107.1668166874009; Fri, 11 Nov 2022 03:41:14 -0800 (PST) Received: from localhost.localdomain ([2a02:6d40:39af:c100:1891:6c61:50fd:e567]) by smtp.gmail.com with ESMTPSA id i2-20020a1709061e4200b007ad84cf1346sm788585ejj.110.2022.11.11.03.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Nov 2022 03:41:13 -0800 (PST) From: christian.ehrhardt@canonical.com To: Olivier Matz Cc: dpdk stable Subject: patch 'event/sw: fix log in self test' has been queued to stable release 19.11.14 Date: Fri, 11 Nov 2022 12:38:55 +0100 Message-Id: <20221111113904.1549618-38-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> References: <20221111113904.1549618-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.14 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/18/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/7bb8064071a494e087e6970635df1a9285ef60b8 Thanks. Christian Ehrhardt --- >From 7bb8064071a494e087e6970635df1a9285ef60b8 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/event/sw/sw_evdev_selftest.c b/drivers/event/sw/sw_evdev_selftest.c index f89b77ce9e..e290cd4776 100644 --- a/drivers/event/sw/sw_evdev_selftest.c +++ b/drivers/event/sw/sw_evdev_selftest.c @@ -1634,8 +1634,8 @@ 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); + " got %"PRIu64"\n", __LINE__, port_names[i], + port_expected[i], val); failed = 1; } /* reset to zero */ -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-11 12:35:06.117096903 +0100 +++ 0038-event-sw-fix-log-in-self-test.patch 2022-11-11 12:35:04.797192195 +0100 @@ -1 +1 @@ -From 05d22d4e061a3ac92cb8f076c5ecaed653d4f640 Mon Sep 17 00:00:00 2001 +From 7bb8064071a494e087e6970635df1a9285ef60b8 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 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -17 +18 @@ -index 9f27d8a189..3aa8d76ca8 100644 +index f89b77ce9e..e290cd4776 100644 @@ -20 +21,2 @@ -@@ -1640,7 +1640,7 @@ xstats_id_reset_tests(struct test *t) +@@ -1634,8 +1634,8 @@ xstats_id_reset_tests(struct test *t) + } @@ -22,4 +24,5 @@ - printf("%d: %s value incorrect, expected %" PRIu64 - " got %" PRIu64 "\n", -- __LINE__, port_names[i], port_expected[i], id); -+ __LINE__, port_names[i], port_expected[i], val); + printf("%d: %s value incorrect, expected %"PRIu64 +- " got %d\n", __LINE__, port_names[i], +- port_expected[i], id); ++ " got %"PRIu64"\n", __LINE__, port_names[i], ++ port_expected[i], val);