mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 09:55:55 +00:00
qemu-storage-daemon: Fix non-string --object properties
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:
parent
d6a5beeb2b
commit
eaae29ef89
|
@ -90,6 +90,10 @@ Object *user_creatable_add_type(const char *type, const char *id,
|
|||
/**
|
||||
* user_creatable_add_dict:
|
||||
* @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
|
||||
*
|
||||
* 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
|
||||
* 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:
|
||||
|
|
|
@ -278,7 +278,6 @@ static void process_options(int argc, char *argv[])
|
|||
QemuOpts *opts;
|
||||
const char *type;
|
||||
QDict *args;
|
||||
QObject *ret_data = NULL;
|
||||
|
||||
/* FIXME The keyval parser rejects 'help' arguments, so we must
|
||||
* unconditionall try QemuOpts first. */
|
||||
|
@ -291,9 +290,8 @@ static void process_options(int argc, char *argv[])
|
|||
qemu_opts_del(opts);
|
||||
|
||||
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(ret_data);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
|
@ -106,7 +106,7 @@ out:
|
|||
return obj;
|
||||
}
|
||||
|
||||
void user_creatable_add_dict(QDict *qdict, Error **errp)
|
||||
void user_creatable_add_dict(QDict *qdict, bool keyval, Error **errp)
|
||||
{
|
||||
Visitor *v;
|
||||
Object *obj;
|
||||
|
@ -127,7 +127,11 @@ void user_creatable_add_dict(QDict *qdict, Error **errp)
|
|||
}
|
||||
qdict_del(qdict, "id");
|
||||
|
||||
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);
|
||||
visit_free(v);
|
||||
object_unref(obj);
|
||||
|
|
|
@ -263,7 +263,7 @@ void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue