[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/18] qemu-option: qemu_opts_validate(): use error_
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 06/18] qemu-option: qemu_opts_validate(): use error_set() |
Date: |
Tue, 17 Apr 2012 16:36:09 -0300 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
net.c | 6 +++++-
qemu-option.c | 16 +++++-----------
qemu-option.h | 2 +-
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/net.c b/net.c
index 1922d8a..f5d9cc7 100644
--- a/net.c
+++ b/net.c
@@ -1136,10 +1136,14 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int
is_netdev)
for (i = 0; i < NET_CLIENT_TYPE_MAX; i++) {
if (net_client_types[i].type != NULL &&
!strcmp(net_client_types[i].type, type)) {
+ Error *local_err = NULL;
VLANState *vlan = NULL;
int ret;
- if (qemu_opts_validate(opts, &net_client_types[i].desc[0]) == -1) {
+ qemu_opts_validate(opts, &net_client_types[i].desc[0], &local_err);
+ if (error_is_set(&local_err)) {
+ qerror_report_err(local_err);
+ error_free(local_err);
return -1;
}
diff --git a/qemu-option.c b/qemu-option.c
index 4829de5..5299a30 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -1047,7 +1047,7 @@ QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict)
/* Validate parsed opts against descriptions where no
* descriptions were provided in the QemuOptsList.
*/
-int qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc)
+void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp)
{
QemuOpt *opt;
Error *local_err = NULL;
@@ -1063,24 +1063,18 @@ int qemu_opts_validate(QemuOpts *opts, const
QemuOptDesc *desc)
}
}
if (desc[i].name == NULL) {
- error_set(&local_err, QERR_INVALID_PARAMETER, opt->name);
- goto exit_err;
+ error_set(errp, QERR_INVALID_PARAMETER, opt->name);
+ return;
}
opt->desc = &desc[i];
qemu_opt_parse(opt, &local_err);
if (error_is_set(&local_err)) {
- goto exit_err;
+ error_propagate(errp, local_err);
+ return;
}
}
-
- return 0;
-
-exit_err:
- qerror_report_err(local_err);
- error_free(local_err);
- return -1;
}
int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void
*opaque,
diff --git a/qemu-option.h b/qemu-option.h
index 4d5b3d3..e9fbbb5 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -125,7 +125,7 @@ int qemu_opts_set(QemuOptsList *list, const char *id,
const char *name, const char *value);
const char *qemu_opts_id(QemuOpts *opts);
void qemu_opts_del(QemuOpts *opts);
-int qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc);
+void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp);
int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char
*firstname);
QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int
permit_abbrev);
void qemu_opts_set_defaults(QemuOptsList *list, const char *params,
--
1.7.9.2.384.g4a92a
- [Qemu-devel] [PATCH 00/18]: qapi: convert netdev_add & netdev_del, Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 02/18] qemu-option: parse_option_number(): use error_set(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 01/18] qemu-option: qemu_opts_create(): use error_set(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 06/18] qemu-option: qemu_opts_validate(): use error_set(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 05/18] qemu-option: qemu_opt_parse(): use error_set(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 07/18] qemu-option: opt_set(): use error_set(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 10/18] qemu-option: introduce qemu_opt_set_err(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 08/18] qemu-option: opts_do_parse(): use error_set(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 09/18] qemu-option: qemu_opts_do_parse(): convert error_set(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 04/18] qemu-option: parse_option_size(): use error_set(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 14/18] qstring: introduce qstring_len(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 03/18] qemu-option: parse_option_bool(): use error_set(), Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 11/18] qerror: introduce QERR_INVALID_OPTION_GROUP, Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 12/18] qemu-config: find_list(): use error_set(), Luiz Capitulino, 2012/04/17