]> git.proxmox.com Git - mirror_qemu.git/commit
qemu-option: Clean up fragile use of error_is_set()
authorMarkus Armbruster <armbru@redhat.com>
Fri, 2 May 2014 11:26:40 +0000 (13:26 +0200)
committerLuiz Capitulino <lcapitulino@redhat.com>
Fri, 9 May 2014 13:11:31 +0000 (09:11 -0400)
commit2767ceec4ed1d6ac9785d9866c80dc7d674a3631
tree930b25a811475f6b9a5ebb64e37354bb303fc176
parent5e54769c921a3d8cd8858444f5a3fa62cc44260e
qemu-option: Clean up fragile use of error_is_set()

Using error_is_set(ERRP) to find out whether to bail out due to
previous error is either wrong, fragile, or unnecessarily opaque.
It's wrong when ERRP may be null, because errors go undetected when it
is.  It's fragile when proving ERRP non-null involves a non-local
argument.  Else, it's unnecessarily opaque (see commit 84d18f0).

The error_is_set(state->errp) in qemu_opts_from_qdict_1() is merely
fragile, because the callers never pass state argument with null
state->errp.

Make the code more robust and more obviously correct: test
*state->errp directly.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
util/qemu-option.c