[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 1/5] qom: split object_property_set_link()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 1/5] qom: split object_property_set_link() |
Date: |
Wed, 5 Mar 2014 21:51:20 +0100 |
The path resolution logic in object_property_set_link() should be a
separate function. This makes the code easier to read and maintain.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
qom/object.c | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 39 insertions(+), 20 deletions(-)
diff --git a/qom/object.c b/qom/object.c
index 660859c..6e2443c 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1039,17 +1039,49 @@ static void object_get_link_property(Object *obj,
Visitor *v, void *opaque,
}
}
+/* object_resolve_link:
+ *
+ * Lookup an object and ensure its type matches the link property type. This
+ * is similar to object_resolve_path() except type verification against the
+ * link property is performed.
+ *
+ * Returns: The matched object or NULL on path lookup failures.
+ */
+static Object *object_resolve_link(Object *obj, const char *name,
+ const char *path, Error **errp)
+{
+ const char *type;
+ gchar *target_type;
+ bool ambiguous = false;
+ Object *target;
+
+ /* Go from link<FOO> to FOO. */
+ type = object_property_get_type(obj, name, NULL);
+ target_type = g_strndup(&type[5], strlen(type) - 6);
+ target = object_resolve_path_type(path, target_type, &ambiguous);
+
+ if (ambiguous) {
+ error_set(errp, QERR_AMBIGUOUS_PATH, path);
+ } else if (!target) {
+ target = object_resolve_path(path, &ambiguous);
+ if (target || ambiguous) {
+ error_set(errp, QERR_INVALID_PARAMETER_TYPE, name, target_type);
+ } else {
+ error_set(errp, QERR_DEVICE_NOT_FOUND, path);
+ }
+ target = NULL;
+ }
+ g_free(target_type);
+
+ return target;
+}
+
static void object_set_link_property(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
Object **child = opaque;
Object *old_target;
- bool ambiguous = false;
- const char *type;
char *path;
- gchar *target_type;
-
- type = object_property_get_type(obj, name, NULL);
visit_type_str(v, &path, name, errp);
@@ -1059,24 +1091,11 @@ static void object_set_link_property(Object *obj,
Visitor *v, void *opaque,
if (strcmp(path, "") != 0) {
Object *target;
- /* Go from link<FOO> to FOO. */
- target_type = g_strndup(&type[5], strlen(type) - 6);
- target = object_resolve_path_type(path, target_type, &ambiguous);
-
- if (ambiguous) {
- error_set(errp, QERR_AMBIGUOUS_PATH, path);
- } else if (target) {
+ target = object_resolve_link(obj, name, path, errp);
+ if (target) {
object_ref(target);
*child = target;
- } else {
- target = object_resolve_path(path, &ambiguous);
- if (target || ambiguous) {
- error_set(errp, QERR_INVALID_PARAMETER_TYPE, name,
target_type);
- } else {
- error_set(errp, QERR_DEVICE_NOT_FOUND, path);
- }
}
- g_free(target_type);
}
g_free(path);
--
1.8.5.3
- [Qemu-devel] [PATCH v3 0/5] qom: link property fixes, Stefan Hajnoczi, 2014/03/05
- [Qemu-devel] [PATCH v3 1/5] qom: split object_property_set_link(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 4/5] qom: add check() argument to object_property_add_link(), Stefan Hajnoczi, 2014/03/05
- [Qemu-devel] [PATCH v3 5/5] virtio-rng: avoid default_backend refcount leak, Stefan Hajnoczi, 2014/03/05
- [Qemu-devel] [PATCH v3 3/5] qom: make QOM link property unref optional, Stefan Hajnoczi, 2014/03/05
- [Qemu-devel] [PATCH v3 2/5] qom: don't make link NULL on object_property_set_link() failure, Stefan Hajnoczi, 2014/03/05
- Re: [Qemu-devel] [PATCH v3 0/5] qom: link property fixes, Stefan Hajnoczi, 2014/03/18
- Re: [Qemu-devel] [PATCH v3 0/5] qom: link property fixes, Stefan Hajnoczi, 2014/03/18