[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/17] option: Pass local error object pointer to er
From: |
Greg Kurz |
Subject: |
[Qemu-devel] [PATCH 15/17] option: Pass local error object pointer to error_append_hint() |
Date: |
Tue, 17 Sep 2019 12:22:05 +0200 |
User-agent: |
StGit/unknown-version |
Ensure that hints are added even if errp is &error_fatal or &error_abort.
Signed-off-by: Greg Kurz <address@hidden>
---
util/qemu-option.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 97172b5eaa7f..2a45dfa585d4 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -155,11 +155,14 @@ void parse_option_size(const char *name, const char
*value,
return;
}
if (err) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name,
+ Error *local_err = NULL;
+
+ error_setg(&local_err, QERR_INVALID_PARAMETER_VALUE, name,
"a non-negative number below 2^64");
- error_append_hint(errp, "Optional suffix k, M, G, T, P or E means"
+ error_append_hint(&local_err, "Optional suffix k, M, G, T, P or E
means"
" kilo-, mega-, giga-, tera-, peta-\n"
"and exabytes, respectively.\n");
+ error_propagate(errp, local_err);
return;
}
*ret = size;
@@ -664,10 +667,13 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char
*id,
if (id) {
if (!id_wellformed(id)) {
- error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "id",
+ Error *local_err = NULL;
+
+ error_setg(&local_err, QERR_INVALID_PARAMETER_VALUE, "id",
"an identifier");
- error_append_hint(errp, "Identifiers consist of letters, digits, "
+ error_append_hint(&local_err, "Identifiers consist of letters,
digits, "
"'-', '.', '_', starting with a letter.\n");
+ error_propagate(errp, local_err);
return NULL;
}
opts = qemu_opts_find(list, id);
- [Qemu-devel] [PATCH 08/17] pcie_root_port: Pass local error object pointer to error_append_hint(), (continued)
- [Qemu-devel] [PATCH 08/17] pcie_root_port: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 09/17] hw/rdma: Fix missing conversion to rdma_error_report(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 10/17] s390x/css: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 11/17] scsi: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 12/17] migration: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 13/17] nbd: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 14/17] ccid-card-emul: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 15/17] option: Pass local error object pointer to error_append_hint(),
Greg Kurz <=
- [Qemu-devel] [PATCH 16/17] socket: Pass local error object pointer to error_append_hint(), Greg Kurz, 2019/09/17
- [Qemu-devel] [PATCH 17/17] checkpatch: Warn when errp is passed to error_append_hint(), Greg Kurz, 2019/09/17
- Re: [Qemu-devel] [PATCH 00/17] Fix usage of error_append_hint(), Philippe Mathieu-Daudé, 2019/09/17