Commit 66d5c7c6 authored by Leonard Crestez's avatar Leonard Crestez Committed by Linus Torvalds

scripts/gdb: clean up error handling in list helpers

An incorrect argument to list_for_each is an internal error in gdb
scripts so a TypeError should be raised.  The gdb.GdbError exception
type is intended for user errors such as incorrect invocation.

Drop the type assertion in list_for_each_entry because list_for_each
isn't going to suddenly yield something else.

Applies to both list and hlist

Link: http://lkml.kernel.org/r/c1d3fd4db13d999a3ba57f5bbc1924862d824f61.1556881728.git.leonard.crestez@nxp.comSigned-off-by: default avatarLeonard Crestez <leonard.crestez@nxp.com>
Reviewed-by: default avatarStephen Boyd <sboyd@kernel.org>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Kieran Bingham <kbingham@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 988b2686
...@@ -24,7 +24,7 @@ def list_for_each(head): ...@@ -24,7 +24,7 @@ def list_for_each(head):
if head.type == list_head.get_type().pointer(): if head.type == list_head.get_type().pointer():
head = head.dereference() head = head.dereference()
elif head.type != list_head.get_type(): elif head.type != list_head.get_type():
raise gdb.GdbError("Must be struct list_head not {}" raise TypeError("Must be struct list_head not {}"
.format(head.type)) .format(head.type))
node = head['next'].dereference() node = head['next'].dereference()
...@@ -35,9 +35,6 @@ def list_for_each(head): ...@@ -35,9 +35,6 @@ def list_for_each(head):
def list_for_each_entry(head, gdbtype, member): def list_for_each_entry(head, gdbtype, member):
for node in list_for_each(head): for node in list_for_each(head):
if node.type != list_head.get_type().pointer():
raise TypeError("Type {} found. Expected struct list_head *."
.format(node.type))
yield utils.container_of(node, gdbtype, member) yield utils.container_of(node, gdbtype, member)
...@@ -45,7 +42,7 @@ def hlist_for_each(head): ...@@ -45,7 +42,7 @@ def hlist_for_each(head):
if head.type == hlist_head.get_type().pointer(): if head.type == hlist_head.get_type().pointer():
head = head.dereference() head = head.dereference()
elif head.type != hlist_head.get_type(): elif head.type != hlist_head.get_type():
raise gdb.GdbError("Must be struct hlist_head not {}" raise TypeError("Must be struct hlist_head not {}"
.format(head.type)) .format(head.type))
node = head['first'].dereference() node = head['first'].dereference()
...@@ -56,9 +53,6 @@ def hlist_for_each(head): ...@@ -56,9 +53,6 @@ def hlist_for_each(head):
def hlist_for_each_entry(head, gdbtype, member): def hlist_for_each_entry(head, gdbtype, member):
for node in hlist_for_each(head): for node in hlist_for_each(head):
if node.type != hlist_node.get_type().pointer():
raise TypeError("Type {} found. Expected struct hlist_head *."
.format(node.type))
yield utils.container_of(node, gdbtype, member) yield utils.container_of(node, gdbtype, member)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment