[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 1/4] object_add: consolidate error handling
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v1 1/4] object_add: consolidate error handling |
Date: |
Thu, 16 Jan 2014 17:34:36 +0100 |
Signed-off-by: Igor Mammedov <address@hidden>
---
qmp.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/qmp.c b/qmp.c
index 0f46171..a67e0c4 100644
--- a/qmp.c
+++ b/qmp.c
@@ -549,15 +549,17 @@ void object_add(const char *type, const char *id, const
QDict *qdict,
for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
object_property_set(obj, v, e->key, &local_err);
if (local_err) {
- error_propagate(errp, local_err);
- object_unref(obj);
- return;
+ goto out;
}
}
}
object_property_add_child(container_get(object_get_root(), "/objects"),
- id, obj, errp);
+ id, obj, &local_err);
+out:
+ if (local_err) {
+ error_propagate(errp, local_err);
+ }
object_unref(obj);
}
--
1.7.1
- [Qemu-devel] [PATCH v1 0/4] -object/object-add add 2nd stage initialization, Igor Mammedov, 2014/01/16
- [Qemu-devel] [PATCH v1 1/4] object_add: consolidate error handling,
Igor Mammedov <=
- [Qemu-devel] [PATCH v1 3/4] add optional 2nd stage initialization to -object/object-add commands, Igor Mammedov, 2014/01/16
- [Qemu-devel] [PATCH v1 2/4] vl.c: -object: don't ingnore duplicate 'id', Igor Mammedov, 2014/01/16
- [Qemu-devel] [PATCH v1 4/4] virtio_rng: replace custom backend API with UserCreatable.complete() callback, Igor Mammedov, 2014/01/16
- Re: [Qemu-devel] [PATCH v1 0/4] -object/object-add add 2nd stage initialization, Stefan Hajnoczi, 2014/01/17
- Re: [Qemu-devel] [PATCH v1 0/4] -object/object-add add 2nd stage initialization, Luiz Capitulino, 2014/01/22