aboutsummaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
Diffstat (limited to 'qom')
-rw-r--r--qom/object.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/qom/object.c b/qom/object.c
index 3d6a955..02c0a3a 100644
--- a/qom/object.c
+++ b/qom/object.c
@@ -1222,7 +1222,7 @@ int object_property_get_enum(Object *obj, const char *name,
{
Error *err = NULL;
StringOutputVisitor *sov;
- StringInputVisitor *siv;
+ Visitor *v;
char *str;
int ret;
ObjectProperty *prop = object_property_find(obj, name, errp);
@@ -1249,13 +1249,12 @@ int object_property_get_enum(Object *obj, const char *name,
return 0;
}
str = string_output_get_string(sov);
- siv = string_input_visitor_new(str);
string_output_visitor_cleanup(sov);
- visit_type_enum(string_input_get_visitor(siv), name, &ret,
- enumprop->strings, errp);
+ v = string_input_visitor_new(str);
+ visit_type_enum(v, name, &ret, enumprop->strings, errp);
g_free(str);
- string_input_visitor_cleanup(siv);
+ visit_free(v);
return ret;
}
@@ -1265,7 +1264,7 @@ void object_property_get_uint16List(Object *obj, const char *name,
{
Error *err = NULL;
StringOutputVisitor *ov;
- StringInputVisitor *iv;
+ Visitor *v;
char *str;
ov = string_output_visitor_new(false);
@@ -1276,11 +1275,11 @@ void object_property_get_uint16List(Object *obj, const char *name,
goto out;
}
str = string_output_get_string(ov);
- iv = string_input_visitor_new(str);
- visit_type_uint16List(string_input_get_visitor(iv), NULL, list, errp);
+ v = string_input_visitor_new(str);
+ visit_type_uint16List(v, NULL, list, errp);
g_free(str);
- string_input_visitor_cleanup(iv);
+ visit_free(v);
out:
string_output_visitor_cleanup(ov);
}
@@ -1288,11 +1287,9 @@ out:
void object_property_parse(Object *obj, const char *string,
const char *name, Error **errp)
{
- StringInputVisitor *siv;
- siv = string_input_visitor_new(string);
- object_property_set(obj, string_input_get_visitor(siv), name, errp);
-
- string_input_visitor_cleanup(siv);
+ Visitor *v = string_input_visitor_new(string);
+ object_property_set(obj, v, name, errp);
+ visit_free(v);
}
char *object_property_print(Object *obj, const char *name, bool human,