evan/qemu-xteink
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qom: Add user_creatable_add_from_str()

Browse Source 
This is a version of user_creatable_process_cmdline() with an Error
parameter that never calls exit() and is therefore usable in HMP.

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:
Kevin Wolf
2021-02-17 14:59:06 +01:00
parent fa40e43ca0
commit ffd58ef88c
2 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qom/object_interfaces.c
+24 -5
View File
@@ -292,26 +292,45 @@ static void user_creatable_print_help_from_qdict(QDict *args)
}
}
void user_creatable_process_cmdline(const char *optarg)
bool user_creatable_add_from_str(const char *optarg, Error **errp)
{
ERRP_GUARD();
QDict *args;
bool help;
Visitor *v;
ObjectOptions *options;
args = keyval_parse(optarg, "qom-type", &help, &error_fatal);
args = keyval_parse(optarg, "qom-type", &help, errp);
if (*errp) {
return false;
}
if (help) {
user_creatable_print_help_from_qdict(args);
exit(EXIT_SUCCESS);
qobject_unref(args);
return false;
}
v = qobject_input_visitor_new_keyval(QOBJECT(args));
visit_type_ObjectOptions(v, NULL, &options, &error_fatal);
visit_type_ObjectOptions(v, NULL, &options, errp);
visit_free(v);
qobject_unref(args);
user_creatable_add_qapi(options, &error_fatal);
if (*errp) {
goto out;
}
user_creatable_add_qapi(options, errp);
out:
qapi_free_ObjectOptions(options);
return !*errp;
}
void user_creatable_process_cmdline(const char *optarg)
{
if (!user_creatable_add_from_str(optarg, &error_fatal)) {
/* Help was printed */
exit(EXIT_SUCCESS);
}
}
bool user_creatable_del(const char *id, Error **errp)