|
@@ -477,23 +477,6 @@ enum {
|
|
|
OPTION_IMAGE_OPTS = 257,
|
|
|
};
|
|
|
|
|
|
-static QemuOptsList qemu_object_opts = {
|
|
|
- .name = "object",
|
|
|
- .implied_opt_name = "qom-type",
|
|
|
- .head = QTAILQ_HEAD_INITIALIZER(qemu_object_opts.head),
|
|
|
- .desc = {
|
|
|
- { }
|
|
|
- },
|
|
|
-};
|
|
|
-
|
|
|
-static bool qemu_io_object_print_help(const char *type, QemuOpts *opts)
|
|
|
-{
|
|
|
- if (user_creatable_print_help(type, opts)) {
|
|
|
- exit(0);
|
|
|
- }
|
|
|
- return true;
|
|
|
-}
|
|
|
-
|
|
|
static QemuOptsList file_opts = {
|
|
|
.name = "file",
|
|
|
.implied_opt_name = "file",
|
|
@@ -550,7 +533,6 @@ int main(int argc, char **argv)
|
|
|
qcrypto_init(&error_fatal);
|
|
|
|
|
|
module_call_init(MODULE_INIT_QOM);
|
|
|
- qemu_add_opts(&qemu_object_opts);
|
|
|
qemu_add_opts(&qemu_trace_opts);
|
|
|
bdrv_init();
|
|
|
|
|
@@ -612,14 +594,9 @@ int main(int argc, char **argv)
|
|
|
case 'U':
|
|
|
force_share = true;
|
|
|
break;
|
|
|
- case OPTION_OBJECT: {
|
|
|
- QemuOpts *qopts;
|
|
|
- qopts = qemu_opts_parse_noisily(&qemu_object_opts,
|
|
|
- optarg, true);
|
|
|
- if (!qopts) {
|
|
|
- exit(1);
|
|
|
- }
|
|
|
- } break;
|
|
|
+ case OPTION_OBJECT:
|
|
|
+ user_creatable_process_cmdline(optarg);
|
|
|
+ break;
|
|
|
case OPTION_IMAGE_OPTS:
|
|
|
imageOpts = true;
|
|
|
break;
|
|
@@ -644,10 +621,6 @@ int main(int argc, char **argv)
|
|
|
exit(1);
|
|
|
}
|
|
|
|
|
|
- qemu_opts_foreach(&qemu_object_opts,
|
|
|
- user_creatable_add_opts_foreach,
|
|
|
- qemu_io_object_print_help, &error_fatal);
|
|
|
-
|
|
|
if (!trace_init_backends()) {
|
|
|
exit(1);
|
|
|
}
|