DPDK patches and discussions
 help / color / mirror / Atom feed
From: Srikanth Yalavarthi <syalavarthi@marvell.com>
To: David Marchand <david.marchand@redhat.com>,
	Aaron Conole <aconole@redhat.com>,
	Igor Russkikh <irusskikh@marvell.com>
Cc: <dev@dpdk.org>, <syalavarthi@marvell.com>,
	<sshankarnara@marvell.com>, <aprabhu@marvell.com>,
	<ptakkar@marvell.com>, <jerinjacobk@gmail.com>, <stable@dpdk.org>
Subject: [PATCH 1/1] eal: enable xz read support and ignore warning
Date: Fri, 22 Sep 2023 09:53:55 -0700	[thread overview]
Message-ID: <20230922165356.31567-1-syalavarthi@marvell.com> (raw)

archive_read_support_filter_xz returns a warning when
compression is not fully supported and is supported
through external program. This warning can be ignored
when reading the files through firmware open as only
decompression is required.

Fixes: 40edb9c0d36b ("eal: handle compressed firmware")
Cc: stable@dpdk.org

Signed-off-by: Srikanth Yalavarthi <syalavarthi@marvell.com>
---
 lib/eal/unix/eal_firmware.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/eal/unix/eal_firmware.c b/lib/eal/unix/eal_firmware.c
index d1616b0bd9..05c06c222a 100644
--- a/lib/eal/unix/eal_firmware.c
+++ b/lib/eal/unix/eal_firmware.c
@@ -25,12 +25,19 @@ static int
 firmware_open(struct firmware_read_ctx *ctx, const char *name, size_t blocksize)
 {
 	struct archive_entry *e;
+	int err;
 
 	ctx->a = archive_read_new();
 	if (ctx->a == NULL)
 		return -1;
+
+	err = archive_read_support_filter_xz(ctx->a);
+	if (err != ARCHIVE_OK && err != ARCHIVE_WARN) {
+		ctx->a = NULL;
+		return -1;
+	}
+
 	if (archive_read_support_format_raw(ctx->a) != ARCHIVE_OK ||
-			archive_read_support_filter_xz(ctx->a) != ARCHIVE_OK ||
 			archive_read_open_filename(ctx->a, name, blocksize) != ARCHIVE_OK ||
 			archive_read_next_header(ctx->a, &e) != ARCHIVE_OK) {
 		archive_read_free(ctx->a);
-- 
2.41.0


             reply	other threads:[~2023-09-22 16:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-22 16:53 Srikanth Yalavarthi [this message]
2023-09-25  9:10 ` David Marchand
2023-09-26 13:32   ` [EXT] " Srikanth Yalavarthi
2023-09-26 13:30 ` [PATCH v2 1/1] eal: update " Srikanth Yalavarthi
2023-09-26 13:56   ` David Marchand
2023-09-26 14:47     ` [EXT] " Srikanth Yalavarthi
2023-09-26 13:49 ` [PATCH v3 " Srikanth Yalavarthi
2023-09-26 14:44 ` [PATCH v4 1/1] eal/unix: fix firmware reading with external xz helper Srikanth Yalavarthi
2023-09-27  8:20   ` David Marchand
2023-09-27  9:35     ` David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230922165356.31567-1-syalavarthi@marvell.com \
    --to=syalavarthi@marvell.com \
    --cc=aconole@redhat.com \
    --cc=aprabhu@marvell.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=irusskikh@marvell.com \
    --cc=jerinjacobk@gmail.com \
    --cc=ptakkar@marvell.com \
    --cc=sshankarnara@marvell.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).