[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/21] error: Convert qemu_opts_set() to QError
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 08/21] error: Convert qemu_opts_set() to QError |
Date: |
Mon, 5 Apr 2010 17:33:49 -0300 |
From: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
qemu-option.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/qemu-option.c b/qemu-option.c
index 12ce322..394c763 100644
--- a/qemu-option.c
+++ b/qemu-option.c
@@ -176,7 +176,7 @@ static int parse_option_bool(const char *name, const char
*value, int *ret)
} else if (!strcmp(value, "off")) {
*ret = 0;
} else {
- fprintf(stderr, "Option '%s': Use 'on' or 'off'\n", name);
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "'on' or 'off'");
return -1;
}
} else {
@@ -193,12 +193,12 @@ static int parse_option_number(const char *name, const
char *value, uint64_t *re
if (value != NULL) {
number = strtoull(value, &postfix, 0);
if (*postfix != '\0') {
- fprintf(stderr, "Option '%s' needs a number as parameter\n", name);
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a number");
return -1;
}
*ret = number;
} else {
- fprintf(stderr, "Option '%s' needs a parameter\n", name);
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a number");
return -1;
}
return 0;
@@ -226,13 +226,13 @@ static int parse_option_size(const char *name, const char
*value, uint64_t *ret)
*ret = (uint64_t) sizef;
break;
default:
- fprintf(stderr, "Option '%s' needs size as parameter\n", name);
- fprintf(stderr, "You may use k, M, G or T suffixes for "
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a size");
+ error_printf_unless_qmp("You may use k, M, G or T suffixes for "
"kilobytes, megabytes, gigabytes and terabytes.\n");
return -1;
}
} else {
- fprintf(stderr, "Option '%s' needs a parameter\n", name);
+ qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a size");
return -1;
}
return 0;
@@ -581,8 +581,7 @@ int qemu_opt_set(QemuOpts *opts, const char *name, const
char *value)
if (i == 0) {
/* empty list -> allow any */;
} else {
- fprintf(stderr, "option \"%s\" is not valid for %s\n",
- name, opts->list->name);
+ qerror_report(QERR_INVALID_PARAMETER, name);
return -1;
}
}
@@ -598,8 +597,6 @@ int qemu_opt_set(QemuOpts *opts, const char *name, const
char *value)
opt->str = qemu_strdup(value);
}
if (qemu_opt_parse(opt) < 0) {
- fprintf(stderr, "Failed to parse \"%s\" for \"%s.%s\"\n", opt->str,
- opts->list->name, opt->name);
qemu_opt_del(opt);
return -1;
}
--
1.7.0.4.297.g6555b1
- [Qemu-devel] [PATCH 01/21] qdev: Convert qdev_unplug() to QError, (continued)
- [Qemu-devel] [PATCH 01/21] qdev: Convert qdev_unplug() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 06/21] error: Convert qemu_opts_create() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 04/21] error: Put error definitions back in alphabetical order, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 12/21] error: Convert net_client_init() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 20/21] QMP: Improve RTC_CHANGE event description, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 17/21] monitor: Use argument type 'b' for set_link, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 02/21] monitor: convert do_device_del() to QObject, QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 15/21] monitor: Rename argument type 'b' to 'f', Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 09/21] error: Drop extra messages after qemu_opts_set() and qemu_opts_parse(), Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 05/21] error: New QERR_DUPLICATE_ID, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 08/21] error: Convert qemu_opts_set() to QError,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 16/21] monitor: New argument type 'b', Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 14/21] monitor: New commands netdev_add, netdev_del, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 13/21] error: New QERR_DEVICE_IN_USE, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 11/21] error: Convert qemu_opts_validate() to QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 19/21] virtio-blk: Fix use after free in error case, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 21/21] Monitor: Convert do_screen_dump() to QObject, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 18/21] monitor: Convert do_set_link() to QObject, QError, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 10/21] error: Use QERR_INVALID_PARAMETER_VALUE instead of QERR_INVALID_PARAMETER, Luiz Capitulino, 2010/04/05
- [Qemu-devel] [PATCH 03/21] Add qerror message if the 'change' target filename can't be opened, Luiz Capitulino, 2010/04/05
- Re: [Qemu-devel] [PATCH 00/21][PULL]: QMP/Monitor queue, Aurelien Jarno, 2010/04/18