[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/35] object_add: allow completion handler to get c
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH 03/35] object_add: allow completion handler to get canonical path |
Date: |
Fri, 4 Apr 2014 15:36:28 +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 | 12 ++++++++----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/qmp.c b/qmp.c
index 87a28f7..ac8693d 100644
--- a/qmp.c
+++ b/qmp.c
@@ -564,13 +564,18 @@ void object_add(const char *type, const char *id, const
QDict *qdict,
goto out;
}
- 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 67fd5bb..2181b41 100644
--- a/vl.c
+++ b/vl.c
@@ -2914,14 +2914,18 @@ static int object_create(QemuOpts *opts, void *opaque)
goto out;
}
- 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:
object_unref(obj);
if (local_err) {
--
1.9.0
- [Qemu-devel] [PATCH 00/35] pc: ACPI memory hotplug, Igor Mammedov, 2014/04/04
- [Qemu-devel] [PATCH 01/35] qemu-option: introduce qemu_find_opts_singleton, Igor Mammedov, 2014/04/04
- [Qemu-devel] [PATCH 04/35] add memdev backend infrastructure, Igor Mammedov, 2014/04/04
- [Qemu-devel] [PATCH 05/35] vl.c: extend -m option to support options for memory hotplug, Igor Mammedov, 2014/04/04
- [Qemu-devel] [PATCH 06/35] add pc-{i440fx,q35}-2.1 machine types, Igor Mammedov, 2014/04/04
- [Qemu-devel] [PATCH 03/35] object_add: allow completion handler to get canonical path,
Igor Mammedov <=
- [Qemu-devel] [PATCH 08/35] qdev: hotplug for buss-less devices, Igor Mammedov, 2014/04/04
[Qemu-devel] [PATCH 09/35] qdev: expose DeviceState.hotplugged field as a property, Igor Mammedov, 2014/04/04