Commit b781a60b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-06-09' into staging 



Error reporting patches

# gpg: Signature made Tue Jun  9 06:42:15 2015 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-error-2015-06-09:
  vhost-user: Improve -netdev/netdev_add/-net/... error reporting
  QemuOpts: Convert qemu_opt_foreach() to Error
  QemuOpts: Drop qemu_opt_foreach() parameter abort_on_failure
  blkdebug: Simplify passing of Error through qemu_opts_foreach()
  QemuOpts: Convert qemu_opts_foreach() to Error
  QemuOpts: Drop qemu_opts_foreach() parameter abort_on_failure
  vl: Fail right after first bad -object
  vl: Print -device help at most once
  vl: Report failure to sandbox at most once

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ee09f84e 81904831

block/blkdebug.c

+5 −7
Original line number Diff line number Diff line
@@ -216,10 +216,9 @@ 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)

static int add_rule(void *opaque, QemuOpts *opts, Error **errp)

{

    struct add_rule_data *d = opaque;

    BDRVBlkdebugState *s = d->s;
@@ -230,10 +229,10 @@ 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) {

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

        error_setg(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);

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

        return -1;

    }
@@ -319,8 +318,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, 


    d.s = s;

    d.action = ACTION_INJECT_ERROR;

    d.errp = &local_err;

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

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

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;
@@ -328,7 +326,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, 
    }



    d.action = ACTION_SET_STATE;

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

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

    if (local_err) {

        error_propagate(errp, local_err);

        ret = -EINVAL;

hw/core/qdev-properties-system.c

+3 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd) 
    nd->instantiated = 1;

}



static int qdev_add_one_global(QemuOpts *opts, void *opaque)

static int qdev_add_one_global(void *opaque, QemuOpts *opts, Error **errp)

{

    GlobalProperty *g;
@@ -404,5 +404,6 @@ static int qdev_add_one_global(QemuOpts *opts, void *opaque) 


void qemu_add_globals(void)

{

    qemu_opts_foreach(qemu_find_opts("global"), qdev_add_one_global, NULL, 0);

    qemu_opts_foreach(qemu_find_opts("global"),

                      qdev_add_one_global, NULL, NULL);

}

include/qemu/option.h

+7 −5
Original line number Diff line number Diff line
@@ -100,9 +100,11 @@ void qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val, 
                       Error **errp);

void qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val,

                         Error **errp);

typedef int (*qemu_opt_loopfunc)(const char *name, const char *value, void *opaque);

typedef int (*qemu_opt_loopfunc)(void *opaque,

                                 const char *name, const char *value,

                                 Error **errp);

int qemu_opt_foreach(QemuOpts *opts, qemu_opt_loopfunc func, void *opaque,

                     int abort_on_failure);

                     Error **errp);



QemuOpts *qemu_opts_find(QemuOptsList *list, const char *id);

QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,
@@ -125,10 +127,10 @@ QemuOpts *qemu_opts_from_qdict(QemuOptsList *list, const QDict *qdict, 
QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict);

void qemu_opts_absorb_qdict(QemuOpts *opts, QDict *qdict, Error **errp);



typedef int (*qemu_opts_loopfunc)(QemuOpts *opts, void *opaque);

typedef int (*qemu_opts_loopfunc)(void *opaque, QemuOpts *opts, Error **errp);

int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func,

                      void *opaque, Error **errp);

void qemu_opts_print(QemuOpts *opts, const char *sep);

int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque,

                      int abort_on_failure);

void qemu_opts_print_help(QemuOptsList *list);

void qemu_opts_free(QemuOptsList *list);

QemuOptsList *qemu_opts_append(QemuOptsList *dst, QemuOptsList *list);

include/ui/console.h

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ char *vnc_display_local_addr(const char *id); 
int vnc_display_password(const char *id, const char *password);

int vnc_display_pw_expire(const char *id, time_t expires);

QemuOpts *vnc_parse_func(const char *str);

int vnc_init_func(QemuOpts *opts, void *opaque);

int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp);

#else

static inline int vnc_display_password(const char *id, const char *password)

{

net/net.c

+6 −4
Original line number Diff line number Diff line
@@ -1329,7 +1329,7 @@ void net_check_clients(void) 
    }

}



static int net_init_client(QemuOpts *opts, void *dummy)

static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)

{

    Error *local_err = NULL;
@@ -1342,7 +1342,7 @@ static int net_init_client(QemuOpts *opts, void *dummy) 
    return 0;

}



static int net_init_netdev(QemuOpts *opts, void *dummy)

static int net_init_netdev(void *dummy, QemuOpts *opts, Error **errp)

{

    Error *local_err = NULL;

    int ret;
@@ -1373,10 +1373,12 @@ int net_init_clients(void) 


    QTAILQ_INIT(&net_clients);



    if (qemu_opts_foreach(qemu_find_opts("netdev"), net_init_netdev, NULL, 1) == -1)

    if (qemu_opts_foreach(qemu_find_opts("netdev"),

                          net_init_netdev, NULL, NULL)) {

        return -1;

    }



    if (qemu_opts_foreach(net, net_init_client, NULL, 1) == -1) {

    if (qemu_opts_foreach(net, net_init_client, NULL, NULL)) {

        return -1;

    }