[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v19 01/11] object_add: allow completion handler to g
From: |
Hu Tao |
Subject: |
[Qemu-devel] [PATCH v19 01/11] object_add: allow completion handler to get canonical path |
Date: |
Tue, 4 Mar 2014 15:28:15 +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>
---
qmp.c | 8 +++++---
vl.c | 9 +++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/qmp.c b/qmp.c
index d0d98e7..2ff943d 100644
--- a/qmp.c
+++ b/qmp.c
@@ -561,13 +561,15 @@ void object_add(const char *type, const char *id, const
QDict *qdict,
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:
if (local_err) {
error_propagate(errp, local_err);
diff --git a/vl.c b/vl.c
index 899b63f..7d9ac8a 100644
--- a/vl.c
+++ b/vl.c
@@ -2673,14 +2673,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.8.5.2.229.g4448466
- [Qemu-devel] [PATCH v19 00/11] Add support for binding guest numa nodes to host numa nodes, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 05/11] numa: add -numa node, memdev= option, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 11/11] hmp: add info memdev, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 02/11] add memdev backend infrastructure, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 01/11] object_add: allow completion handler to get canonical path,
Hu Tao <=
- [Qemu-devel] [PATCH v19 08/11] Add Linux libnuma detection, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 03/11] pc: pass QEMUMachineInitArgs to pc_memory_init, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 06/11] qapi: make string input visitor parse int list, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 09/11] hostmem backend: implement memory policy, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 10/11] qmp: add query-memdev, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 04/11] numa: introduce memory_region_allocate_system_memory, Hu Tao, 2014/03/04
- [Qemu-devel] [PATCH v19 07/11] qapi: make string output visitor parse int list, Hu Tao, 2014/03/04