[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/13] qemu-option: opt_set(): use error_set()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 06/13] qemu-option: opt_set(): use error_set() |
Date: |
Thu, 29 Mar 2012 14:26:36 -0300 |
The functions qemu_opt_set() and opts_do_parse() both call opt_set(),
but their callers expect QError semantics. Thus, both functions call
qerro_report_err() to keep the expected semantics.
Signed-off-by: Luiz Capitulino <address@hidden>
---
qemu-option.c | 38 +++++++++++++++++++++-----------------
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/qemu-option.c b/qemu-option.c
index 4829de5..38461d4 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -615,12 +615,11 @@ static void qemu_opt_del(QemuOpt *opt)
g_free(opt);
}
-static int opt_set(QemuOpts *opts, const char *name, const char *value,
- bool prepend)
+static void opt_set(QemuOpts *opts, const char *name, const char *value,
+ bool prepend, Error **errp)
{
QemuOpt *opt;
const QemuOptDesc *desc = opts->list->desc;
- Error *local_err = NULL;
int i;
for (i = 0; desc[i].name != NULL; i++) {
@@ -632,8 +631,8 @@ static int opt_set(QemuOpts *opts, const char *name, const
char *value,
if (i == 0) {
/* empty list -> allow any */;
} else {
- error_set(&local_err, QERR_INVALID_PARAMETER, name);
- goto exit_err;
+ error_set(errp, QERR_INVALID_PARAMETER, name);
+ return;
}
}
@@ -651,23 +650,24 @@ static int opt_set(QemuOpts *opts, const char *name,
const char *value,
if (value) {
opt->str = g_strdup(value);
}
- qemu_opt_parse(opt, &local_err);
- if (error_is_set(&local_err)) {
+ qemu_opt_parse(opt, errp);
+ if (error_is_set(errp)) {
qemu_opt_del(opt);
- goto exit_err;
}
-
- return 0;
-
-exit_err:
- qerror_report_err(local_err);
- error_free(local_err);
- return -1;
}
int qemu_opt_set(QemuOpts *opts, const char *name, const char *value)
{
- return opt_set(opts, name, value, false);
+ Error *local_err = NULL;
+
+ opt_set(opts, name, value, false, &local_err);
+ if (error_is_set(&local_err)) {
+ qerror_report_err(local_err);
+ error_free(local_err);
+ return -1;
+ }
+
+ return 0;
}
int qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val)
@@ -853,6 +853,7 @@ static int opts_do_parse(QemuOpts *opts, const char *params,
{
char option[128], value[1024];
const char *p,*pe,*pc;
+ Error *local_err = NULL;
for (p = params; *p != '\0'; p++) {
pe = strchr(p, '=');
@@ -884,7 +885,10 @@ static int opts_do_parse(QemuOpts *opts, const char
*params,
}
if (strcmp(option, "id") != 0) {
/* store and parse */
- if (opt_set(opts, option, value, prepend) == -1) {
+ opt_set(opts, option, value, prepend, &local_err);
+ if (error_is_set(&local_err)) {
+ qerror_report_err(local_err);
+ error_free(local_err);
return -1;
}
}
--
1.7.9.2.384.g4a92a
- [Qemu-devel] [RFC 00/13]: convert device_add to the qapi, Luiz Capitulino, 2012/03/29
- [Qemu-devel] [PATCH 01/13] qemu-option: qemu_opts_create(): use error_set(), Luiz Capitulino, 2012/03/29
- [Qemu-devel] [PATCH 02/13] qemu-option: parse_option_number(): use error_set(), Luiz Capitulino, 2012/03/29
- [Qemu-devel] [PATCH 07/13] qemu-option: opts_do_parse(): use error_set(), Luiz Capitulino, 2012/03/29
- [Qemu-devel] [PATCH 04/13] qemu-option: parse_option_size(): use error_set(), Luiz Capitulino, 2012/03/29
- [Qemu-devel] [PATCH 09/13] qerror: introduce QERR_INVALID_OPTION_GROUP, Luiz Capitulino, 2012/03/29
- [Qemu-devel] [PATCH 06/13] qemu-option: opt_set(): use error_set(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 03/13] qemu-option: parse_option_bool(): use error_set(), Luiz Capitulino, 2012/03/29
- [Qemu-devel] [PATCH 08/13] qemu-option: introduce qemu_opt_set_err(), Luiz Capitulino, 2012/03/29
- [Qemu-devel] [PATCH 12/13] qapi: support for keyworded variable-length argument list, Luiz Capitulino, 2012/03/29
- Re: [Qemu-devel] [PATCH 12/13] qapi: support for keyworded variable-length argument list, Anthony Liguori, 2012/03/29
- Re: [Qemu-devel] [PATCH 12/13] qapi: support for keyworded variable-length argument list, Michael Roth, 2012/03/29
- Re: [Qemu-devel] [PATCH 12/13] qapi: support for keyworded variable-length argument list, Anthony Liguori, 2012/03/29
- Re: [Qemu-devel] [PATCH 12/13] qapi: support for keyworded variable-length argument list, Michael Roth, 2012/03/29
- Re: [Qemu-devel] [PATCH 12/13] qapi: support for keyworded variable-length argument list, Michael Roth, 2012/03/29