From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by dpdk.org (Postfix) with ESMTP id D07134C80 for ; Thu, 8 Nov 2018 19:01:47 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id z16-v6so22249319wrv.2 for ; Thu, 08 Nov 2018 10:01:47 -0800 (PST) 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=wPqhIPSshX+ZfQhKj/XruQ171N5VaUmyp/4sJzBcm/c=; b=k5TggKc/eEJlSDTqCvkGZ5yvLd/Z/xeBFejEIGudFBi1JMR5k5gfguXlgNQpElyUCh Lp2geCj+gktJHaLlMkgZBple+u5pvBoMatlM7fs5AkUdgrsM00kPXk17vYhxQ6U3z98P i78oxT3pUmhFRpGs8Y9sPRzMWZCwivki3OiH+pkVfoU3m7WS8I7tkAFAOwf3DkjNH2Px 471eNNB2UyTk00sbjEuiBpPzf75n0hU5eIj/9EawZAlJObqOeVMexn6C0XynUlx/VwhR tI6btO2Fhbhs4FK9w716IY/2rGeeR7007C1AdnWD16Zj59+SHNpIH236+9CxjNVmKtRK 8XLA== X-Gm-Message-State: AGRZ1gJj5i27gNcPejJeWNY9J2EOBMeAL7bjaKG5RurajcPK91t3Raze bRJdcl1ZLxKalggd4jqvhFh4gqxPAyM= X-Google-Smtp-Source: AJdET5feGjbnAQ8Xjg3FIPFztYJQX+MIZFpx4+wIWsWfxLzh8IBJVh1KzhzscRWhJx95kK8chjMnyw== X-Received: by 2002:adf:bd0f:: with SMTP id j15-v6mr4886198wrh.267.1541700107427; Thu, 08 Nov 2018 10:01:47 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id v8-v6sm5387990wrr.41.2018.11.08.10.01.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 10:01:46 -0800 (PST) From: Luca Boccassi To: Dharmik Thakkar Cc: Honnappa Nagarahalli , Gavin Hu , dpdk stable Date: Thu, 8 Nov 2018 18:01:09 +0000 Message-Id: <20181108180111.25873-13-bluca@debian.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181108180111.25873-1-bluca@debian.org> References: <20181029125329.17729-20-bluca@debian.org> <20181108180111.25873-1-bluca@debian.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/hash: fix build' has been queued to LTS release 16.11.9 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: , X-List-Received-Date: Thu, 08 Nov 2018 18:01:48 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.9 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/10/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Luca Boccassi --- >>From 9cabaa9961be492d42e1a8b0c047b1b8397eb417 Mon Sep 17 00:00:00 2001 From: Dharmik Thakkar Date: Fri, 26 Oct 2018 16:43:03 -0500 Subject: [PATCH] test/hash: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 57ed574e263444928b793fff0d287121112fba84 ] Enable print_key_info() function compilation always. Compilation error message: 'test_hash.c: In function ‘print_key_info’: test_hash.c:90:15: error: cast discards ‘const’ qualifier from pointer target type [-Werror=cast-qual] uint8_t *p = (uint8_t *)key; ^ cc1: all warnings being treated as errors' Fixes: af75078fece36 ("first public release") Suggested-by: Honnappa Nagarahalli Signed-off-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu --- app/test/test_hash.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/app/test/test_hash.c b/app/test/test_hash.c index 2c87efe69..c55ec0da4 100644 --- a/app/test/test_hash.c +++ b/app/test/test_hash.c @@ -110,29 +110,23 @@ static uint32_t pseudo_hash(__attribute__((unused)) const void *keys, return 3; } +#define UNIT_TEST_HASH_VERBOSE 0 /* * Print out result of unit test hash operation. */ -#if defined(UNIT_TEST_HASH_VERBOSE) static void print_key_info(const char *msg, const struct flow_key *key, int32_t pos) { - uint8_t *p = (uint8_t *)key; - unsigned i; + if (UNIT_TEST_HASH_VERBOSE) { + const uint8_t *p = (const uint8_t *)key; + unsigned int i; - printf("%s key:0x", msg); - for (i = 0; i < sizeof(struct flow_key); i++) { - printf("%02X", p[i]); + printf("%s key:0x", msg); + for (i = 0; i < sizeof(struct flow_key); i++) + printf("%02X", p[i]); + printf(" @ pos %d\n", pos); } - printf(" @ pos %d\n", pos); } -#else -static void print_key_info(__attribute__((unused)) const char *msg, - __attribute__((unused)) const struct flow_key *key, - __attribute__((unused)) int32_t pos) -{ -} -#endif /* Keys used by unit test functions */ static struct flow_key keys[5] = { { -- 2.19.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-08 17:59:30.300565359 +0000 +++ 0013-test-hash-fix-build.patch 2018-11-08 17:59:30.060751011 +0000 @@ -1,4 +1,4 @@ -From 57ed574e263444928b793fff0d287121112fba84 Mon Sep 17 00:00:00 2001 +From 9cabaa9961be492d42e1a8b0c047b1b8397eb417 Mon Sep 17 00:00:00 2001 From: Dharmik Thakkar Date: Fri, 26 Oct 2018 16:43:03 -0500 Subject: [PATCH] test/hash: fix build @@ -6,6 +6,8 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit 57ed574e263444928b793fff0d287121112fba84 ] + Enable print_key_info() function compilation always. Compilation error message: @@ -17,21 +19,20 @@ cc1: all warnings being treated as errors' Fixes: af75078fece36 ("first public release") -Cc: stable@dpdk.org Suggested-by: Honnappa Nagarahalli Signed-off-by: Dharmik Thakkar Reviewed-by: Honnappa Nagarahalli Reviewed-by: Gavin Hu --- - test/test/test_hash.c | 22 ++++++++-------------- + app/test/test_hash.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) -diff --git a/test/test/test_hash.c b/test/test/test_hash.c -index 6d06eb24c..fe607fadf 100644 ---- a/test/test/test_hash.c -+++ b/test/test/test_hash.c -@@ -80,29 +80,23 @@ static uint32_t pseudo_hash(__attribute__((unused)) const void *keys, +diff --git a/app/test/test_hash.c b/app/test/test_hash.c +index 2c87efe69..c55ec0da4 100644 +--- a/app/test/test_hash.c ++++ b/app/test/test_hash.c +@@ -110,29 +110,23 @@ static uint32_t pseudo_hash(__attribute__((unused)) const void *keys, return 3; }