[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 22/25] qom: export more functions for use with non-UserCreatable
From: |
Paolo Bonzini |
Subject: |
[PATCH 22/25] qom: export more functions for use with non-UserCreatable objects |
Date: |
Mon, 18 Jan 2021 11:31:10 -0500 |
Machines and accelerators are not user-creatable but they share
similar parsing machinery. Export functions that will be used
with -machine and -accel in softmmu/vl.c.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/qom/object.h | 21 +++++++++++++++++
qom/object_interfaces.c | 51 +++++++++++++++++++++++++++++------------
2 files changed, 57 insertions(+), 15 deletions(-)
diff --git a/include/qom/object.h b/include/qom/object.h
index d378f13a11..cd27facd8a 100644
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -860,6 +860,27 @@ static void do_qemu_init_ ## type_array(void)
\
} \
type_init(do_qemu_init_ ## type_array)
+/**
+ * type_print_class_properties:
+ * @type: a QOM class name
+ *
+ * Print the object's class properties to stdout or the monitor.
+ * Return whether an object was found.
+ */
+bool type_print_class_properties(const char *type);
+
+/**
+ * object_set_properties_from_keyval:
+ * @obj: a QOM object
+ * @qdict: a dictionary whose leaf values are strings
+ * @errp: pointer to error object
+ *
+ * For each key in the dictionary, parse the value string and set the
+ * corresponding property in @obj.
+ */
+void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
+ Error **errp);
+
/**
* object_class_dynamic_cast_assert:
* @klass: The #ObjectClass to attempt to cast.
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 654f717431..80efea2ca9 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -38,13 +38,45 @@ bool user_creatable_can_be_deleted(UserCreatable *uc)
}
}
+static void object_set_properties_from_qdict(Object *obj, const QDict *qdict,
+ Visitor *v, Error **errp)
+{
+ const QDictEntry *e;
+ Error *local_err = NULL;
+
+ if (!visit_start_struct(v, NULL, NULL, 0, &local_err)) {
+ goto out;
+ }
+ for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
+ if (!object_property_set(obj, e->key, v, &local_err)) {
+ break;
+ }
+ }
+ if (!local_err) {
+ visit_check_struct(v, &local_err);
+ }
+ visit_end_struct(v, NULL);
+
+out:
+ if (local_err) {
+ error_propagate(errp, local_err);
+ }
+}
+
+void object_set_properties_from_keyval(Object *obj, const QDict *qdict,
+ Error **errp)
+{
+ Visitor *v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
+ object_set_properties_from_qdict(obj, qdict, v, errp);
+ visit_free(v);
+}
+
Object *user_creatable_add_type(const char *type, const char *id,
const QDict *qdict,
Visitor *v, Error **errp)
{
Object *obj;
ObjectClass *klass;
- const QDictEntry *e;
Error *local_err = NULL;
klass = object_class_by_name(type);
@@ -66,18 +98,7 @@ Object *user_creatable_add_type(const char *type, const char
*id,
assert(qdict);
obj = object_new(type);
- if (!visit_start_struct(v, NULL, NULL, 0, &local_err)) {
- goto out;
- }
- for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) {
- if (!object_property_set(obj, e->key, v, &local_err)) {
- break;
- }
- }
- if (!local_err) {
- visit_check_struct(v, &local_err);
- }
- visit_end_struct(v, NULL);
+ object_set_properties_from_qdict(obj, qdict, v, &local_err);
if (local_err) {
goto out;
}
@@ -177,7 +198,7 @@ void user_creatable_print_types(void)
g_slist_free(list);
}
-static bool user_creatable_print_type_properites(const char *type)
+bool type_print_class_properties(const char *type)
{
ObjectClass *klass;
ObjectPropertyIterator iter;
@@ -219,7 +240,7 @@ void user_creatable_print_help_from_qdict(const QDict *args)
{
const char *type = qdict_get_try_str(args, "qom-type");
- if (!type || !user_creatable_print_type_properites(type)) {
+ if (!type || !type_print_class_properties(type)) {
user_creatable_print_types();
}
}
--
2.26.2
- Re: [PATCH 12/25] qemu-config: add error propagation to qemu_config_parse, (continued)
- [PATCH 13/25] qemu-option: support accept-any QemuOptsList in qemu_opts_absorb_qdict, Paolo Bonzini, 2021/01/18
- [PATCH 08/25] hmp: replace "O" parser with keyval, Paolo Bonzini, 2021/01/18
- [PATCH 17/25] qemu-io: use keyval for -object parsing, Paolo Bonzini, 2021/01/18
- [PATCH 20/25] qemu: use keyval for -object parsing, Paolo Bonzini, 2021/01/18
- [PATCH 21/25] storage-daemon: do not register the "object" group with QemuOpts, Paolo Bonzini, 2021/01/18
- [PATCH 25/25] vl: switch -accel parsing to keyval, Paolo Bonzini, 2021/01/18
- [PATCH 24/25] qemu-option: remove now-dead code, Paolo Bonzini, 2021/01/18
- [PATCH 18/25] qemu-nbd: use keyval for -object parsing, Paolo Bonzini, 2021/01/18
- [PATCH 22/25] qom: export more functions for use with non-UserCreatable objects,
Paolo Bonzini <=
- [PATCH 23/25] vl: switch -M parsing to keyval, Paolo Bonzini, 2021/01/18
- [PATCH 19/25] qemu-img: use keyval for -object parsing, Paolo Bonzini, 2021/01/18
- Re: [PATCH 00/25] qemu-option, keyval, vl: switch -object/-M/-accel to keyval parsing, no-reply, 2021/01/18