[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/12] hmp: Call visit_end_struct() after visit_s
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 09/12] hmp: Call visit_end_struct() after visit_start_struct() succeeds |
Date: |
Wed, 7 May 2014 09:53:51 +0200 |
When visit_start_struct() succeeds, visit_end_struct() must be called.
hmp_object_add() doesn't when a member visit fails. As far as I can
tell, the opts visitor copes okay with the misuse. Fix it anyway.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
hmp.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hmp.c b/hmp.c
index ad31ceb..a7cd59e 100644
--- a/hmp.c
+++ b/hmp.c
@@ -1384,6 +1384,7 @@ void hmp_netdev_del(Monitor *mon, const QDict *qdict)
void hmp_object_add(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
+ Error *err_end = NULL;
QemuOpts *opts;
char *type = NULL;
char *id = NULL;
@@ -1407,24 +1408,23 @@ void hmp_object_add(Monitor *mon, const QDict *qdict)
qdict_del(pdict, "qom-type");
visit_type_str(opts_get_visitor(ov), &type, "qom-type", &err);
if (err) {
- goto out_clean;
+ goto out_end;
}
qdict_del(pdict, "id");
visit_type_str(opts_get_visitor(ov), &id, "id", &err);
if (err) {
- goto out_clean;
+ goto out_end;
}
object_add(type, id, pdict, opts_get_visitor(ov), &err);
- if (err) {
- goto out_clean;
- }
- visit_end_struct(opts_get_visitor(ov), &err);
- if (err) {
+
+out_end:
+ visit_end_struct(opts_get_visitor(ov), &err_end);
+ if (!err && err_end) {
qmp_object_del(id, NULL);
}
-
+ error_propagate(&err, err_end);
out_clean:
opts_visitor_cleanup(ov);
--
1.8.1.4
- [Qemu-devel] [PATCH v2 03/12] qapi: Remove unused Visitor callbacks start_handle(), end_handle(), (continued)
- [Qemu-devel] [PATCH v2 03/12] qapi: Remove unused Visitor callbacks start_handle(), end_handle(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 05/12] qapi-visit.py: Clean up confusing push_indent() / pop_indent() use, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 02/12] qapi: Normalize marshalling's visitor initialization and cleanup, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 07/12] qapi-visit.py: Clean up a sloppy use of field prefix, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 04/12] qapi: Replace start_optional()/end_optional() by optional(), Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 12/12] qapi: Replace uncommon use of the error API by the common one, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 11/12] tests: Don't call visit_end_struct() after visit_start_struct() fails, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 06/12] qapi: Clean up shadowing of parameters and locals in inner scopes, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 08/12] qapi: Un-inline visit of implicit struct, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 10/12] hw: Don't call visit_end_struct() after visit_start_struct() fails, Markus Armbruster, 2014/05/07
- [Qemu-devel] [PATCH v2 09/12] hmp: Call visit_end_struct() after visit_start_struct() succeeds,
Markus Armbruster <=
- Re: [Qemu-devel] [PATCH v2 00/12] qapi: Purge error_is_set(), Luiz Capitulino, 2014/05/15