[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3.2 08/31] qmp: allow object-add completion handler
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v3.2 08/31] qmp: allow object-add completion handler to get canonical path |
Date: |
Wed, 14 May 2014 17:43:12 +0800 |
From: Igor Mammedov <address@hidden>
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>
Signed-off-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hu Tao <address@hidden>
---
qmp.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 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);
--
1.8.5.2.229.g4448466
- [Qemu-devel] [PATCH v3.2 00/31] NUMA series, and hostmem improvements, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 03/31] NUMA: Add numa_info structure to contain numa nodes info, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 05/31] NUMA: expand MAX_NODES from 64 to 128, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 01/31] NUMA: move numa related code to new file numa.c, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 06/31] man: improve -numa doc, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 07/31] vl: redo -object parsing, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 08/31] qmp: allow object-add completion handler to get canonical path,
Hu Tao <=
- [Qemu-devel] [PATCH v3.2 09/31] qmp: improve error reporting for -object and object-add, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 02/31] NUMA: check if the total numa memory size is equal to ram_size, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 10/31] pc: pass QEMUMachineInitArgs to pc_memory_init, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 15/31] memory: move mem_path handling to memory_region_allocate_system_memory, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 04/31] NUMA: convert -numa option to use OptsVisitor, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 11/31] numa: introduce memory_region_allocate_system_memory, Hu Tao, 2014/05/14
- [Qemu-devel] [PATCH v3.2 12/31] add memdev backend infrastructure, Hu Tao, 2014/05/14