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: Implement --object with qmp_object_add() 

This QAPIfies --object and ensures that QMP and the command line option
behave the same.

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 2020-11-17 15:25:04 +01:00
parent 98c43b7b8b
commit 2daf28557e
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "qapi/qapi-visit-block-export.h" #include "qapi/qapi-visit-block-export.h"
#include "qapi/qapi-visit-control.h" #include "qapi/qapi-visit-control.h"
#include "qapi/qapi-visit-qom.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "qapi/qmp/qstring.h" #include "qapi/qmp/qstring.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
@ -134,15 +135,6 @@ enum {
extern QemuOptsList qemu_chardev_opts; extern QemuOptsList qemu_chardev_opts;
static QemuOptsList qemu_object_opts = {
.name = "object",
.implied_opt_name = "qom-type",
.head = QTAILQ_HEAD_INITIALIZER(qemu_object_opts.head),
.desc = {
{ }
},
};
static void init_qmp_commands(void) static void init_qmp_commands(void)
{ {
qmp_init_marshal(&qmp_commands); qmp_init_marshal(&qmp_commands);
@ -282,14 +274,22 @@ static void process_options(int argc, char *argv[])
{ {
QDict *args; QDict *args;
bool help; bool help;
Visitor *v;
ObjectOptions *options;
args = keyval_parse(optarg, "qom-type", &help, &error_fatal); args = keyval_parse(optarg, "qom-type", &help, &error_fatal);
if (help) { if (help) {
user_creatable_print_help_from_qdict(args); user_creatable_print_help_from_qdict(args);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
user_creatable_add_dict(args, true, &error_fatal);
v = qobject_input_visitor_new_keyval(QOBJECT(args));
visit_type_ObjectOptions(v, NULL, &options, &error_fatal);
visit_free(v);
qobject_unref(args); qobject_unref(args);
qmp_object_add(options, &error_fatal);
qapi_free_ObjectOptions(options);
break; break;
} }
case OPTION_PIDFILE: case OPTION_PIDFILE:
@ -338,7 +338,6 @@ int main(int argc, char *argv[])
module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_QOM);
module_call_init(MODULE_INIT_TRACE); module_call_init(MODULE_INIT_TRACE);
qemu_add_opts(&qemu_object_opts);
qemu_add_opts(&qemu_trace_opts); qemu_add_opts(&qemu_trace_opts);
qcrypto_init(&error_fatal); qcrypto_init(&error_fatal);
bdrv_init(); bdrv_init();