Commit d4362d64 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi Committed by Kevin Wolf
Browse files

blkdebug: show an error for invalid event names 



It is easy to typo a blkdebug configuration and waste a lot of time
figuring out why no rules are matching.

Push the Error** down into add_rule() so we can report an error when the
event name is invalid.

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarGonglei <arei.gonglei@huawei.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 4f2280b2

block/blkdebug.c

+19 −3
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static int get_event_by_name(const char *name, BlkDebugEvent *event) 
struct add_rule_data {

    BDRVBlkdebugState *s;

    int action;

    Error **errp;

};



static int add_rule(QemuOpts *opts, void *opaque)
@@ -226,7 +227,11 @@ static int add_rule(QemuOpts *opts, void *opaque) 


    /* Find the right event for the rule */

    event_name = qemu_opt_get(opts, "event");

    if (!event_name || get_event_by_name(event_name, &event) < 0) {

    if (!event_name) {

        error_setg(d->errp, "Missing event name for rule");

        return -1;

    } else if (get_event_by_name(event_name, &event) < 0) {

        error_setg(d->errp, "Invalid event name \"%s\"", event_name);

        return -1;

    }
@@ -312,10 +317,21 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, 


    d.s = s;

    d.action = ACTION_INJECT_ERROR;

    qemu_opts_foreach(&inject_error_opts, add_rule, &d, 0);

    d.errp = &local_err;

    qemu_opts_foreach(&inject_error_opts, add_rule, &d, 1);

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto fail;

    }



    d.action = ACTION_SET_STATE;

    qemu_opts_foreach(&set_state_opts, add_rule, &d, 0);

    qemu_opts_foreach(&set_state_opts, add_rule, &d, 1);

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

        goto fail;

    }



    ret = 0;

fail: