mirror of
https://github.com/mii443/qemu.git
synced 2025-08-22 15:15:46 +00:00
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>
This commit is contained in:
@ -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;
|
||||
|
@ -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)
|
||||
|
Reference in New Issue
Block a user