[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/10] qemu-config: Use ERRP_GUARD() where obviously appropriate
From: |
Markus Armbruster |
Subject: |
[PATCH 07/10] qemu-config: Use ERRP_GUARD() where obviously appropriate |
Date: |
Mon, 21 Nov 2022 09:50:51 +0100 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
util/qemu-config.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/util/qemu-config.c b/util/qemu-config.c
index e983607b46..8c907fa83b 100644
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -318,9 +318,9 @@ void qemu_add_opts(QemuOptsList *list)
static int qemu_config_foreach(FILE *fp, QEMUConfigCB *cb, void *opaque,
const char *fname, Error **errp)
{
+ ERRP_GUARD();
char line[1024], prev_group[64], group[64], arg[64], value[1024];
Location loc;
- Error *local_err = NULL;
QDict *qdict = NULL;
int res = -EINVAL, lno = 0;
int count = 0;
@@ -348,10 +348,9 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB *cb,
void *opaque,
}
if (qdict != prev) {
if (prev) {
- cb(prev_group, prev, opaque, &local_err);
+ cb(prev_group, prev, opaque, errp);
qobject_unref(prev);
- if (local_err) {
- error_propagate(errp, local_err);
+ if (*errp) {
goto out;
}
}
--
2.37.3
- [PATCH 00/10] Cleanups around error_propagate() and ERRP_GUARD(), Markus Armbruster, 2022/11/21
- [PATCH 03/10] error: Move ERRP_GUARD() to the beginning of the function, Markus Armbruster, 2022/11/21
- [PATCH 04/10] monitor: Simplify monitor_fd_param()'s error handling, Markus Armbruster, 2022/11/21
- [PATCH 08/10] sockets: Use ERRP_GUARD() where obviously appropriate, Markus Armbruster, 2022/11/21
- [PATCH 02/10] error: Drop a few superfluous ERRP_GUARD(), Markus Armbruster, 2022/11/21
- [PATCH 07/10] qemu-config: Use ERRP_GUARD() where obviously appropriate,
Markus Armbruster <=
- [PATCH 09/10] qapi: Use returned bool to check for failure (again), Markus Armbruster, 2022/11/21
- [PATCH 10/10] io: Tidy up fat-fingered parameter name, Markus Armbruster, 2022/11/21
- [PATCH 05/10] monitor: Use ERRP_GUARD() in monitor_init(), Markus Armbruster, 2022/11/21
- [PATCH 06/10] qemu-config: Make config_parse_qdict() return bool, Markus Armbruster, 2022/11/21
- [PATCH 01/10] error: Drop some obviously superfluous error_propagate(), Markus Armbruster, 2022/11/21