aboutsummaryrefslogtreecommitdiff
path: root/qom
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2021-02-17 12:06:20 +0100
committerKevin Wolf <kwolf@redhat.com>2021-03-19 10:17:14 +0100
commitf375026606f4ae1486189cb758cd0dfa60b3c18f (patch)
tree8d37e6cbc10043a5a252c3cbf7257f18e8bcb680 /qom
parentc9231123907415d7737263b9ca6f125a8181463b (diff)
downloadqemu-f375026606f4ae1486189cb758cd0dfa60b3c18f.zip
qemu-f375026606f4ae1486189cb758cd0dfa60b3c18f.tar.gz
qemu-f375026606f4ae1486189cb758cd0dfa60b3c18f.tar.bz2
qom: Factor out user_creatable_process_cmdline()
The implementation for --object can be shared between qemu-storage-daemon and other binaries, so move it into a function in qom/object_interfaces.c that is accessible from everywhere. This also requires moving the implementation of qmp_object_add() into a new user_creatable_add_qapi(), because qom/qom-qmp-cmds.c is not linked for tools. user_creatable_print_help_from_qdict() can become static now. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Acked-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'qom')
-rw-r--r--qom/object_interfaces.c51
-rw-r--r--qom/qom-qmp-cmds.c20
2 files changed, 51 insertions, 20 deletions
diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index 02c3934..e10a5cf 100644
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -2,10 +2,13 @@
#include "qemu/cutils.h"
#include "qapi/error.h"
+#include "qapi/qapi-commands-qom.h"
+#include "qapi/qapi-visit-qom.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/qjson.h"
#include "qapi/qobject-input-visitor.h"
+#include "qapi/qobject-output-visitor.h"
#include "qom/object_interfaces.h"
#include "qemu/help_option.h"
#include "qemu/id.h"
@@ -113,6 +116,30 @@ out:
return obj;
}
+void user_creatable_add_qapi(ObjectOptions *options, Error **errp)
+{
+ Visitor *v;
+ QObject *qobj;
+ QDict *props;
+ Object *obj;
+
+ v = qobject_output_visitor_new(&qobj);
+ visit_type_ObjectOptions(v, NULL, &options, &error_abort);
+ visit_complete(v, &qobj);
+ visit_free(v);
+
+ props = qobject_to(QDict, qobj);
+ qdict_del(props, "qom-type");
+ qdict_del(props, "id");
+
+ v = qobject_input_visitor_new(QOBJECT(props));
+ obj = user_creatable_add_type(ObjectType_str(options->qom_type),
+ options->id, props, v, errp);
+ object_unref(obj);
+ qobject_unref(qobj);
+ visit_free(v);
+}
+
Object *user_creatable_add_opts(QemuOpts *opts, Error **errp)
{
Visitor *v;
@@ -256,7 +283,7 @@ bool user_creatable_print_help(const char *type, QemuOpts *opts)
return false;
}
-void user_creatable_print_help_from_qdict(QDict *args)
+static void user_creatable_print_help_from_qdict(QDict *args)
{
const char *type = qdict_get_try_str(args, "qom-type");
@@ -265,6 +292,28 @@ void user_creatable_print_help_from_qdict(QDict *args)
}
}
+void user_creatable_process_cmdline(const char *optarg)
+{
+ QDict *args;
+ bool help;
+ Visitor *v;
+ ObjectOptions *options;
+
+ args = keyval_parse(optarg, "qom-type", &help, &error_fatal);
+ if (help) {
+ user_creatable_print_help_from_qdict(args);
+ exit(EXIT_SUCCESS);
+ }
+
+ v = qobject_input_visitor_new_keyval(QOBJECT(args));
+ visit_type_ObjectOptions(v, NULL, &options, &error_fatal);
+ visit_free(v);
+ qobject_unref(args);
+
+ user_creatable_add_qapi(options, &error_fatal);
+ qapi_free_ObjectOptions(options);
+}
+
bool user_creatable_del(const char *id, Error **errp)
{
QemuOptsList *opts_list;
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index e577a96..2d6f41e 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -228,25 +228,7 @@ ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename,
void qmp_object_add(ObjectOptions *options, Error **errp)
{
- Visitor *v;
- QObject *qobj;
- QDict *props;
- Object *obj;
-
- v = qobject_output_visitor_new(&qobj);
- visit_type_ObjectOptions(v, NULL, &options, &error_abort);
- visit_complete(v, &qobj);
- visit_free(v);
-
- props = qobject_to(QDict, qobj);
- qdict_del(props, "qom-type");
- qdict_del(props, "id");
-
- v = qobject_input_visitor_new(QOBJECT(props));
- obj = user_creatable_add_type(ObjectType_str(options->qom_type),
- options->id, props, v, errp);
- object_unref(obj);
- visit_free(v);
+ user_creatable_add_qapi(options, errp);
}
void qmp_object_del(const char *id, Error **errp)