mirror of https://gitlab.com/qemu-project/qemu
qom: push permission checks up into qdev_property_add_legacy
qdev_property_get and qdev_property_set can generate permission denied errors themselves. Do not duplicate this functionality in qdev_get/set_legacy_property, and clean up excessive indentation. Reviewed-by: Anthony Liguori <anthony@codemonkey.ws> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
0d41d9aabb
commit
e3cb6ba65d
48
hw/qdev.c
48
hw/qdev.c
|
@ -1135,46 +1135,38 @@ static void qdev_get_legacy_property(DeviceState *dev, Visitor *v, void *opaque,
|
||||||
{
|
{
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
|
|
||||||
if (prop->info->print) {
|
char buffer[1024];
|
||||||
char buffer[1024];
|
char *ptr = buffer;
|
||||||
char *ptr = buffer;
|
|
||||||
|
|
||||||
prop->info->print(dev, prop, buffer, sizeof(buffer));
|
prop->info->print(dev, prop, buffer, sizeof(buffer));
|
||||||
visit_type_str(v, &ptr, name, errp);
|
visit_type_str(v, &ptr, name, errp);
|
||||||
} else {
|
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void qdev_set_legacy_property(DeviceState *dev, Visitor *v, void *opaque,
|
static void qdev_set_legacy_property(DeviceState *dev, Visitor *v, void *opaque,
|
||||||
const char *name, Error **errp)
|
const char *name, Error **errp)
|
||||||
{
|
{
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
char *ptr = NULL;
|
||||||
|
int ret;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->state != DEV_STATE_CREATED) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prop->info->parse) {
|
visit_type_str(v, &ptr, name, &local_err);
|
||||||
Error *local_err = NULL;
|
if (local_err) {
|
||||||
char *ptr = NULL;
|
error_propagate(errp, local_err);
|
||||||
|
return;
|
||||||
visit_type_str(v, &ptr, name, &local_err);
|
|
||||||
if (!local_err) {
|
|
||||||
int ret;
|
|
||||||
ret = prop->info->parse(dev, prop, ptr);
|
|
||||||
if (ret != 0) {
|
|
||||||
error_set(errp, QERR_INVALID_PARAMETER_VALUE,
|
|
||||||
name, prop->info->name);
|
|
||||||
}
|
|
||||||
g_free(ptr);
|
|
||||||
} else {
|
|
||||||
error_propagate(errp, local_err);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ret = prop->info->parse(dev, prop, ptr);
|
||||||
|
if (ret != 0) {
|
||||||
|
error_set(errp, QERR_INVALID_PARAMETER_VALUE,
|
||||||
|
name, prop->info->name);
|
||||||
|
}
|
||||||
|
g_free(ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1194,8 +1186,8 @@ void qdev_property_add_legacy(DeviceState *dev, Property *prop,
|
||||||
type = g_strdup_printf("legacy<%s>", prop->info->name);
|
type = g_strdup_printf("legacy<%s>", prop->info->name);
|
||||||
|
|
||||||
qdev_property_add(dev, prop->name, type,
|
qdev_property_add(dev, prop->name, type,
|
||||||
qdev_get_legacy_property,
|
prop->info->print ? qdev_get_legacy_property : NULL,
|
||||||
qdev_set_legacy_property,
|
prop->info->parse ? qdev_set_legacy_property : NULL,
|
||||||
NULL,
|
NULL,
|
||||||
prop, errp);
|
prop, errp);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue