xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 05:20:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

qemu-storage-daemon: Fix non-string --object properties

Browse Source 
After processing the option string with the keyval parser, we get a
QDict that contains only strings. This QDict must be fed to a keyval
visitor which converts the strings into the right data types.

qmp_object_add(), however, uses the normal QObject input visitor, which
expects a QDict where all properties already have the QType that matches
the data type required by the QOM object type.

Change the --object implementation in qemu-storage-daemon so that it
doesn't call qmp_object_add(), but calls user_creatable_add_dict()
directly instead and pass it a new keyval boolean that decides which
visitor must be used.

Reported-by: Coiby Xu <coiby.xu@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2020-04-16 17:26:06 +02:00
parent d6a5beeb2b
commit eaae29ef89
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/qom/object_interfaces.h
View File

@ -90,6 +90,10 @@ Object *user_creatable_add_type(const char *type, const char *id,
/** /**
* user_creatable_add_dict: * user_creatable_add_dict:
* @qdict: the object definition * @qdict: the object definition
* @keyval: if true, use a keyval visitor for processing @qdict (i.e.
* assume that all @qdict values are strings); otherwise, use
* the normal QObject visitor (i.e. assume all @qdict values
* have the QType expected by the QOM object type)
* @errp: if an error occurs, a pointer to an area to store the error * @errp: if an error occurs, a pointer to an area to store the error
* *
* Create an instance of the user creatable object that is defined by * Create an instance of the user creatable object that is defined by
@ -97,7 +101,7 @@ Object *user_creatable_add_type(const char *type, const char *id,
* ID from the key 'id'. The remaining entries in @qdict are used to * ID from the key 'id'. The remaining entries in @qdict are used to
* initialize the object properties. * initialize the object properties.
*/ */
void user_creatable_add_dict(QDict *qdict, Error **errp); void user_creatable_add_dict(QDict *qdict, bool keyval, Error **errp);
/** /**
* user_creatable_add_opts: * user_creatable_add_opts:

4
qemu-storage-daemon.c
View File

@ -278,7 +278,6 @@ static void process_options(int argc, char *argv[])
QemuOpts *opts; QemuOpts *opts;
const char *type; const char *type;
QDict *args; QDict *args;
QObject *ret_data = NULL;
/* FIXME The keyval parser rejects 'help' arguments, so we must /* FIXME The keyval parser rejects 'help' arguments, so we must
* unconditionall try QemuOpts first. */ * unconditionall try QemuOpts first. */
@ -291,9 +290,8 @@ static void process_options(int argc, char *argv[])
qemu_opts_del(opts); qemu_opts_del(opts);
args = keyval_parse(optarg, "qom-type", &error_fatal); args = keyval_parse(optarg, "qom-type", &error_fatal);
qmp_object_add(args, &ret_data, &error_fatal); user_creatable_add_dict(args, true, &error_fatal);
qobject_unref(args); qobject_unref(args);
qobject_unref(ret_data);
break; break;
} }
default: default:

8
qom/object_interfaces.c
View File

@ -106,7 +106,7 @@ out:
return obj; return obj;
} }
void user_creatable_add_dict(QDict *qdict, Error **errp) void user_creatable_add_dict(QDict *qdict, bool keyval, Error **errp)
{ {
Visitor *v; Visitor *v;
Object *obj; Object *obj;
@ -127,7 +127,11 @@ void user_creatable_add_dict(QDict *qdict, Error **errp)
} }
qdict_del(qdict, "id"); qdict_del(qdict, "id");
v = qobject_input_visitor_new(QOBJECT(qdict)); if (keyval) {
v = qobject_input_visitor_new_keyval(QOBJECT(qdict));
} else {
v = qobject_input_visitor_new(QOBJECT(qdict));
}
obj = user_creatable_add_type(type, id, qdict, v, errp); obj = user_creatable_add_type(type, id, qdict, v, errp);
visit_free(v); visit_free(v);
object_unref(obj); object_unref(obj);

2
qom/qom-qmp-cmds.c
View File

@ -263,7 +263,7 @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)
qobject_unref(pdict); qobject_unref(pdict);
} }
user_creatable_add_dict(qdict, errp); user_creatable_add_dict(qdict, false, errp);
} }
void qmp_object_del(const char *id, Error **errp) void qmp_object_del(const char *id, Error **errp)