eaae29ef89
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>
273 lines
7.6 KiB
C
273 lines
7.6 KiB
C
/*
|
|
* QMP commands related to QOM
|
|
*
|
|
* Copyright IBM, Corp. 2011
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2. See
|
|
* the COPYING file in the top-level directory.
|
|
*
|
|
* Contributions after 2012-01-13 are licensed under the terms of the
|
|
* GNU GPL, version 2 or (at your option) any later version.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "block/qdict.h"
|
|
#include "hw/qdev-core.h"
|
|
#include "qapi/error.h"
|
|
#include "qapi/qapi-commands-qdev.h"
|
|
#include "qapi/qapi-commands-qom.h"
|
|
#include "qapi/qmp/qdict.h"
|
|
#include "qapi/qmp/qerror.h"
|
|
#include "qemu/cutils.h"
|
|
#include "qom/object_interfaces.h"
|
|
#include "qom/qom-qobject.h"
|
|
|
|
ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp)
|
|
{
|
|
Object *obj;
|
|
bool ambiguous = false;
|
|
ObjectPropertyInfoList *props = NULL;
|
|
ObjectProperty *prop;
|
|
ObjectPropertyIterator iter;
|
|
|
|
obj = object_resolve_path(path, &ambiguous);
|
|
if (obj == NULL) {
|
|
if (ambiguous) {
|
|
error_setg(errp, "Path '%s' is ambiguous", path);
|
|
} else {
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
"Device '%s' not found", path);
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
object_property_iter_init(&iter, obj);
|
|
while ((prop = object_property_iter_next(&iter))) {
|
|
ObjectPropertyInfoList *entry = g_malloc0(sizeof(*entry));
|
|
|
|
entry->value = g_malloc0(sizeof(ObjectPropertyInfo));
|
|
entry->next = props;
|
|
props = entry;
|
|
|
|
entry->value->name = g_strdup(prop->name);
|
|
entry->value->type = g_strdup(prop->type);
|
|
}
|
|
|
|
return props;
|
|
}
|
|
|
|
void qmp_qom_set(const char *path, const char *property, QObject *value,
|
|
Error **errp)
|
|
{
|
|
Object *obj;
|
|
|
|
obj = object_resolve_path(path, NULL);
|
|
if (!obj) {
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
"Device '%s' not found", path);
|
|
return;
|
|
}
|
|
|
|
object_property_set_qobject(obj, value, property, errp);
|
|
}
|
|
|
|
QObject *qmp_qom_get(const char *path, const char *property, Error **errp)
|
|
{
|
|
Object *obj;
|
|
|
|
obj = object_resolve_path(path, NULL);
|
|
if (!obj) {
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
"Device '%s' not found", path);
|
|
return NULL;
|
|
}
|
|
|
|
return object_property_get_qobject(obj, property, errp);
|
|
}
|
|
|
|
static void qom_list_types_tramp(ObjectClass *klass, void *data)
|
|
{
|
|
ObjectTypeInfoList *e, **pret = data;
|
|
ObjectTypeInfo *info;
|
|
ObjectClass *parent = object_class_get_parent(klass);
|
|
|
|
info = g_malloc0(sizeof(*info));
|
|
info->name = g_strdup(object_class_get_name(klass));
|
|
info->has_abstract = info->abstract = object_class_is_abstract(klass);
|
|
if (parent) {
|
|
info->has_parent = true;
|
|
info->parent = g_strdup(object_class_get_name(parent));
|
|
}
|
|
|
|
e = g_malloc0(sizeof(*e));
|
|
e->value = info;
|
|
e->next = *pret;
|
|
*pret = e;
|
|
}
|
|
|
|
ObjectTypeInfoList *qmp_qom_list_types(bool has_implements,
|
|
const char *implements,
|
|
bool has_abstract,
|
|
bool abstract,
|
|
Error **errp)
|
|
{
|
|
ObjectTypeInfoList *ret = NULL;
|
|
|
|
object_class_foreach(qom_list_types_tramp, implements, abstract, &ret);
|
|
|
|
return ret;
|
|
}
|
|
|
|
ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
|
|
Error **errp)
|
|
{
|
|
ObjectClass *klass;
|
|
Object *obj;
|
|
ObjectProperty *prop;
|
|
ObjectPropertyIterator iter;
|
|
ObjectPropertyInfoList *prop_list = NULL;
|
|
|
|
klass = object_class_by_name(typename);
|
|
if (klass == NULL) {
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
"Device '%s' not found", typename);
|
|
return NULL;
|
|
}
|
|
|
|
klass = object_class_dynamic_cast(klass, TYPE_DEVICE);
|
|
if (klass == NULL) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_DEVICE);
|
|
return NULL;
|
|
}
|
|
|
|
if (object_class_is_abstract(klass)) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename",
|
|
"non-abstract device type");
|
|
return NULL;
|
|
}
|
|
|
|
obj = object_new(typename);
|
|
|
|
object_property_iter_init(&iter, obj);
|
|
while ((prop = object_property_iter_next(&iter))) {
|
|
ObjectPropertyInfo *info;
|
|
ObjectPropertyInfoList *entry;
|
|
|
|
/* Skip Object and DeviceState properties */
|
|
if (strcmp(prop->name, "type") == 0 ||
|
|
strcmp(prop->name, "realized") == 0 ||
|
|
strcmp(prop->name, "hotpluggable") == 0 ||
|
|
strcmp(prop->name, "hotplugged") == 0 ||
|
|
strcmp(prop->name, "parent_bus") == 0) {
|
|
continue;
|
|
}
|
|
|
|
/* Skip legacy properties since they are just string versions of
|
|
* properties that we already list.
|
|
*/
|
|
if (strstart(prop->name, "legacy-", NULL)) {
|
|
continue;
|
|
}
|
|
|
|
info = g_new0(ObjectPropertyInfo, 1);
|
|
info->name = g_strdup(prop->name);
|
|
info->type = g_strdup(prop->type);
|
|
info->has_description = !!prop->description;
|
|
info->description = g_strdup(prop->description);
|
|
info->default_value = qobject_ref(prop->defval);
|
|
info->has_default_value = !!info->default_value;
|
|
|
|
entry = g_malloc0(sizeof(*entry));
|
|
entry->value = info;
|
|
entry->next = prop_list;
|
|
prop_list = entry;
|
|
}
|
|
|
|
object_unref(obj);
|
|
|
|
return prop_list;
|
|
}
|
|
|
|
ObjectPropertyInfoList *qmp_qom_list_properties(const char *typename,
|
|
Error **errp)
|
|
{
|
|
ObjectClass *klass;
|
|
Object *obj = NULL;
|
|
ObjectProperty *prop;
|
|
ObjectPropertyIterator iter;
|
|
ObjectPropertyInfoList *prop_list = NULL;
|
|
|
|
klass = object_class_by_name(typename);
|
|
if (klass == NULL) {
|
|
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
|
|
"Class '%s' not found", typename);
|
|
return NULL;
|
|
}
|
|
|
|
klass = object_class_dynamic_cast(klass, TYPE_OBJECT);
|
|
if (klass == NULL) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_OBJECT);
|
|
return NULL;
|
|
}
|
|
|
|
if (object_class_is_abstract(klass)) {
|
|
object_class_property_iter_init(&iter, klass);
|
|
} else {
|
|
obj = object_new(typename);
|
|
object_property_iter_init(&iter, obj);
|
|
}
|
|
while ((prop = object_property_iter_next(&iter))) {
|
|
ObjectPropertyInfo *info;
|
|
ObjectPropertyInfoList *entry;
|
|
|
|
info = g_malloc0(sizeof(*info));
|
|
info->name = g_strdup(prop->name);
|
|
info->type = g_strdup(prop->type);
|
|
info->has_description = !!prop->description;
|
|
info->description = g_strdup(prop->description);
|
|
|
|
entry = g_malloc0(sizeof(*entry));
|
|
entry->value = info;
|
|
entry->next = prop_list;
|
|
prop_list = entry;
|
|
}
|
|
|
|
object_unref(obj);
|
|
|
|
return prop_list;
|
|
}
|
|
|
|
void qmp_object_add(QDict *qdict, QObject **ret_data, Error **errp)
|
|
{
|
|
QObject *props;
|
|
QDict *pdict;
|
|
|
|
props = qdict_get(qdict, "props");
|
|
if (props) {
|
|
pdict = qobject_to(QDict, props);
|
|
if (!pdict) {
|
|
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, "props", "dict");
|
|
return;
|
|
}
|
|
qobject_ref(pdict);
|
|
qdict_del(qdict, "props");
|
|
qdict_join(qdict, pdict, false);
|
|
if (qdict_size(pdict) != 0) {
|
|
error_setg(errp, "Option in 'props' conflicts with top level");
|
|
qobject_unref(pdict);
|
|
return;
|
|
}
|
|
qobject_unref(pdict);
|
|
}
|
|
|
|
user_creatable_add_dict(qdict, false, errp);
|
|
}
|
|
|
|
void qmp_object_del(const char *id, Error **errp)
|
|
{
|
|
user_creatable_del(id, errp);
|
|
}
|