ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-storage-daemon: Remove QemuOpts from --object parser 

The command line parser for --object parses the input twice: Once into
QemuOpts just for detecting help options, and then again into a QDict
using the keyval parser for actually creating the object.

Now that the keyval parser can also detect help options, we can simplify
this and remove the QemuOpts part.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201007164903.282198-5-kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2020-10-07 18:49:03 +02:00
parent c9ac145843
commit 8db1efd3f3
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
storage-daemon/qemu-storage-daemon.c
View File

@ -264,21 +264,14 @@ static void process_options(int argc, char *argv[])
} }
case OPTION_OBJECT: case OPTION_OBJECT:
{ {
QemuOpts *opts;
const char *type;
QDict *args; QDict *args;
bool help;
/* FIXME The keyval parser rejects 'help' arguments, so we must args = keyval_parse(optarg, "qom-type", &help, &error_fatal);
* unconditionall try QemuOpts first. */ if (help) {
opts = qemu_opts_parse(&qemu_object_opts, user_creatable_print_help_from_qdict(args);
optarg, true, &error_fatal);
type = qemu_opt_get(opts, "qom-type");
if (type && user_creatable_print_help(type, opts)) {
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
qemu_opts_del(opts);
args = keyval_parse(optarg, "qom-type", NULL, &error_fatal);
user_creatable_add_dict(args, true, &error_fatal); user_creatable_add_dict(args, true, &error_fatal);
qobject_unref(args); qobject_unref(args);
break; break;