netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stanislav Fomichev <sdf@google.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
	pabeni@redhat.com, Stanislav Fomichev <sdf@google.com>
Subject: [PATCH net-next 3/4] ynl: replace print with NlError
Date: Fri, 17 Mar 2023 17:23:39 -0700	[thread overview]
Message-ID: <20230318002340.1306356-4-sdf@google.com> (raw)
In-Reply-To: <20230318002340.1306356-1-sdf@google.com>

Instead of dumping the error on the stdout, make the callee and
opportunity to decide what to do with it. This is mostly for the
ethtool testing.

Signed-off-by: Stanislav Fomichev <sdf@google.com>
---
 tools/net/ynl/lib/ynl.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py
index 21c015911803..6c1a59cef957 100644
--- a/tools/net/ynl/lib/ynl.py
+++ b/tools/net/ynl/lib/ynl.py
@@ -67,6 +67,13 @@ from .nlspec import SpecFamily
     NLMSGERR_ATTR_MISS_NEST = 6
 
 
+class NlError(Exception):
+  def __init__(self, nl_msg):
+    self.nl_msg = nl_msg
+
+  def __str__(self):
+    return f"Netlink error: {os.strerror(-self.nl_msg.error)}\n{self.nl_msg}"
+
 class NlAttr:
     def __init__(self, raw, offset):
         self._len, self._type = struct.unpack("HH", raw[offset:offset + 4])
@@ -495,9 +502,7 @@ genl_family_name_to_id = None
                     self._decode_extack(msg, op.attr_set, nl_msg.extack)
 
                 if nl_msg.error:
-                    print("Netlink error:", os.strerror(-nl_msg.error))
-                    print(nl_msg)
-                    return
+                    raise NlError(nl_msg)
                 if nl_msg.done:
                     if nl_msg.extack:
                         print("Netlink warning:")
-- 
2.40.0.rc1.284.g88254d51c5-goog


  parent reply	other threads:[~2023-03-18  0:23 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-18  0:23 [PATCH net-next 0/4] ynl: fill in some gaps of ethtool spec Stanislav Fomichev
2023-03-18  0:23 ` [PATCH net-next 1/4] ynl: support be16 in schemas Stanislav Fomichev
2023-03-18  4:18   ` Jakub Kicinski
2023-03-20 18:03     ` Stanislav Fomichev
2023-03-18  0:23 ` [PATCH net-next 2/4] ynl: populate most of the ethtool spec Stanislav Fomichev
2023-03-18  4:33   ` Jakub Kicinski
2023-03-20 18:03     ` Stanislav Fomichev
2023-03-20 18:59       ` Jakub Kicinski
2023-03-18  0:23 ` Stanislav Fomichev [this message]
2023-03-18  4:21   ` [PATCH net-next 3/4] ynl: replace print with NlError Jakub Kicinski
2023-03-20 18:03     ` Stanislav Fomichev
2023-03-20 18:53       ` Jakub Kicinski
2023-03-18  0:23 ` [PATCH net-next 4/4] ynl: ethtool testing tool Stanislav Fomichev
2023-03-18  4:23   ` Jakub Kicinski
2023-03-20 18:03     ` Stanislav Fomichev
2023-03-18  4:24   ` Jakub Kicinski

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=20230318002340.1306356-4-sdf@google.com \
    --to=sdf@google.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    /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).