aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-03-19 08:58:53 +0100
committerAndreas Färber <afaerber@suse.de>2014-03-19 22:01:13 +0100
commitf5ec6704c73932291c303d0cf72352ac26411d0d (patch)
tree7d62e38c933b0cb71786607581832045202e28de
parentc8897e8eb965c0d091683ffaf127c50f8231d048 (diff)
downloadqemu-arm-f5ec6704c73932291c303d0cf72352ac26411d0d.tar.gz
qom: Split object_property_set_link()
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 <stefanha@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--qom/object.c60
1 files changed, 40 insertions, 20 deletions
diff --git a/qom/object.c b/qom/object.c
index a2a1ffa1b3..2877a00b81 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1039,17 +1039,50 @@ 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 +1092,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);