Commit 2767ceec authored by Markus Armbruster's avatar Markus Armbruster Committed by Luiz Capitulino
Browse files

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 84d18f06).

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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 5e54769c

util/qemu-option.c

+1 −1
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ static void qemu_opts_from_qdict_1(const char *key, QObject *obj, void *opaque) 
    const char *value;

    int n;



    if (!strcmp(key, "id") || error_is_set(state->errp)) {

    if (!strcmp(key, "id") || *state->errp) {

        return;

    }