[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/18] qemu-option: qemu_opts_do_parse(): convert er
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 09/18] qemu-option: qemu_opts_do_parse(): convert error_set() |
Date: |
Tue, 17 Apr 2012 16:36:12 -0300 |
qemu_chr_parse_compat() calls qerror_report_err() because its callers
expect QError semantics.
Signed-off-by: Luiz Capitulino <address@hidden>
---
qemu-char.c | 12 ++++++++++--
qemu-option.c | 10 ++++------
qemu-option.h | 3 ++-
3 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 3a5d2b6..acb0c30 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2651,8 +2651,12 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const
char *filename)
qemu_opt_set(opts, "host", host);
qemu_opt_set(opts, "port", port);
if (p[pos] == ',') {
- if (qemu_opts_do_parse(opts, p+pos+1, NULL) != 0)
+ qemu_opts_do_parse(opts, p+pos+1, NULL, &local_err);
+ if (error_is_set(&local_err)) {
+ qerror_report_err(local_err);
+ error_free(local_err);
goto fail;
+ }
}
if (strstart(filename, "telnet:", &p))
qemu_opt_set(opts, "telnet", "on");
@@ -2683,8 +2687,12 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const
char *filename)
}
if (strstart(filename, "unix:", &p)) {
qemu_opt_set(opts, "backend", "socket");
- if (qemu_opts_do_parse(opts, p, "path") != 0)
+ qemu_opts_do_parse(opts, p, "path", &local_err);
+ if (error_is_set(&local_err)) {
+ qerror_report_err(local_err);
+ error_free(local_err);
goto fail;
+ }
return opts;
}
if (strstart(filename, "/dev/parport", NULL) ||
diff --git a/qemu-option.c b/qemu-option.c
index 41e7a57..8a9d8d5 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -895,18 +895,16 @@ static void opts_do_parse(QemuOpts *opts, const char
*params,
}
}
-int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char
*firstname)
+void qemu_opts_do_parse(QemuOpts *opts, const char *params,
+ const char *firstname, Error **errp)
{
Error *local_err = NULL;
opts_do_parse(opts, params, firstname, false, &local_err);
if (error_is_set(&local_err)) {
- qerror_report_err(local_err);
- error_free(local_err);
- return -1;
+ error_propagate(errp, local_err);
+ return;
}
-
- return 0;
}
static QemuOpts *opts_parse(QemuOptsList *list, const char *params,
diff --git a/qemu-option.h b/qemu-option.h
index e9fbbb5..4480c17 100644
--- a/qemu-option.h
+++ b/qemu-option.h
@@ -126,7 +126,8 @@ int qemu_opts_set(QemuOptsList *list, const char *id,
const char *qemu_opts_id(QemuOpts *opts);
void qemu_opts_del(QemuOpts *opts);
void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp);
-int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char
*firstname);
+void qemu_opts_do_parse(QemuOpts *opts, const char *params,
+ const char *firstname, Error **errp);
QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int
permit_abbrev);
void qemu_opts_set_defaults(QemuOptsList *list, const char *params,
int permit_abbrev);
--
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, 2012/04/17
- [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 <=
- [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
- [Qemu-devel] [PATCH 16/18] net: purge the monitor object from all init functions, Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 17/18] qapi: convert netdev_add, Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 18/18] qapi: convert netdev_del, Luiz Capitulino, 2012/04/17
- [Qemu-devel] [PATCH 15/18] qapi: implement support for variable argument list, Luiz Capitulino, 2012/04/17