diff options
author | Markus Armbruster <armbru@redhat.com> | 2014-04-25 16:50:35 +0200 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-04-25 18:05:06 +0200 |
commit | 172fc4dd33e604dcf868c28e73398c19e161708b (patch) | |
tree | 39f919f2037981bac1def9ccb354ddeedc547943 /blockdev.c | |
parent | f70edf99483e7ee5f89d69fd0c51d04a35f03932 (diff) | |
download | qemu-172fc4dd33e604dcf868c28e73398c19e161708b.zip qemu-172fc4dd33e604dcf868c28e73398c19e161708b.tar.gz qemu-172fc4dd33e604dcf868c28e73398c19e161708b.tar.bz2 |
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>
Diffstat (limited to 'blockdev.c')
0 files changed, 0 insertions, 0 deletions