]> git.proxmox.com Git - mirror_qemu.git/commit - block/iscsi.c
iscsi: Don't use error_is_set() to suppress additional errors
authorMarkus Armbruster <armbru@redhat.com>
Fri, 25 Apr 2014 14:50:35 +0000 (16:50 +0200)
committerStefan Hajnoczi <stefanha@redhat.com>
Fri, 25 Apr 2014 16:05:06 +0000 (18:05 +0200)
commit172fc4dd33e604dcf868c28e73398c19e161708b
tree39f919f2037981bac1def9ccb354ddeedc547943
parentf70edf99483e7ee5f89d69fd0c51d04a35f03932
iscsi: Don't use error_is_set() to suppress additional errors

Using error_is_set(errp) that way can sweep programming errors under
the carpet when we get called incorrectly with an error set.

Commit 24d3bd6 added a broken error path to iscsi_do_inquiry(): it
first calls error_setg(), then jumps to the preexisting error label,
where error_setg() gets called again, triggering an assertion failure.

Commit cbee81f fixed this by guarding the second error_setg() with an
error_is_set().

Replace this fix by a simpler and safer one: jump right behind the
second error_setg().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
block/iscsi.c