[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/31] object_add: allow completion handler to ge
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 02/31] object_add: allow completion handler to get canonical path |
Date: |
Tue, 20 May 2014 17:15:05 +0200 |
Add object to /objects before calling user_creatable_complete()
handler, so that object might be able to call
object_get_canonical_path() in its completion handler.
Signed-off-by: Igor Mammedov <address@hidden>
---
qmp.c | 11 ++++++++---
vl.c | 9 +++++----
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/qmp.c b/qmp.c
index a7f432b..b722dbe 100644
--- a/qmp.c
+++ b/qmp.c
@@ -565,13 +565,18 @@ void object_add(const char *type, const char *id, const
QDict *qdict,
}
}
- user_creatable_complete(obj, &local_err);
+ object_property_add_child(container_get(object_get_root(), "/objects"),
+ id, obj, &local_err);
if (local_err) {
goto out;
}
- object_property_add_child(container_get(object_get_root(), "/objects"),
- id, obj, &local_err);
+ user_creatable_complete(obj, &local_err);
+ if (local_err) {
+ object_property_del(container_get(object_get_root(), "/objects"),
+ id, &error_abort);
+ goto out;
+ }
out:
if (local_err) {
error_propagate(errp, local_err);
diff --git a/vl.c b/vl.c
index 2de90fb..cda6220 100644
--- a/vl.c
+++ b/vl.c
@@ -2932,14 +2932,15 @@ static int object_create(QemuOpts *opts, void *opaque)
goto out;
}
+ object_property_add_child(container_get(object_get_root(), "/objects"),
+ id, obj, &local_err);
+
user_creatable_complete(obj, &local_err);
if (local_err) {
+ object_property_del(container_get(object_get_root(), "/objects"),
+ id, &error_abort);
goto out;
}
-
- object_property_add_child(container_get(object_get_root(), "/objects"),
- id, obj, &local_err);
-
out:
object_unref(obj);
if (local_err) {
--
1.7.1
- [Qemu-devel] [PATCH v2 00/31] pc: ACPI memory hotplug, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 01/31] pc: ACPI BIOS: use enum for defining memory affinity flags, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 02/31] object_add: allow completion handler to get canonical path,
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 04/31] add memdev backend infrastructure, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 03/31] vl.c: daemonize before guest memory allocation, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 06/31] pc: create custom generic PC machine type, Igor Mammedov, 2014/05/20
- [Qemu-devel] [PATCH v2 05/31] vl.c: extend -m option to support options for memory hotplug, Igor Mammedov, 2014/05/20