qdev: Hide "ptr" properties from users
Users can't set them, so qdev_device_help() shouldn't list them. Fix that. Also make qdev_prop_parse() hide them instead of printing a meaningless "has no parser" error message. Their value means nothing to users, so qdev_print_props() shouldn't print it. Fix by removing their print method. Their only use is dirty hacks. Document that.
This commit is contained in:
parent
c64eafaf0c
commit
036f7166c7
|
@ -402,17 +402,11 @@ PropertyInfo qdev_prop_vlan = {
|
||||||
|
|
||||||
/* --- pointer --- */
|
/* --- pointer --- */
|
||||||
|
|
||||||
static int print_ptr(DeviceState *dev, Property *prop, char *dest, size_t len)
|
/* Not a proper property, just for dirty hacks. TODO Remove it! */
|
||||||
{
|
|
||||||
void **ptr = qdev_get_prop_ptr(dev, prop);
|
|
||||||
return snprintf(dest, len, "<%p>", *ptr);
|
|
||||||
}
|
|
||||||
|
|
||||||
PropertyInfo qdev_prop_ptr = {
|
PropertyInfo qdev_prop_ptr = {
|
||||||
.name = "ptr",
|
.name = "ptr",
|
||||||
.type = PROP_TYPE_PTR,
|
.type = PROP_TYPE_PTR,
|
||||||
.size = sizeof(void*),
|
.size = sizeof(void*),
|
||||||
.print = print_ptr,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/* --- mac address --- */
|
/* --- mac address --- */
|
||||||
|
@ -547,16 +541,17 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value)
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
prop = qdev_prop_find(dev, name);
|
prop = qdev_prop_find(dev, name);
|
||||||
if (!prop) {
|
/*
|
||||||
|
* TODO Properties without a parse method are just for dirty
|
||||||
|
* hacks. qdev_prop_ptr is the only such PropertyInfo. It's
|
||||||
|
* marked for removal. The test !prop->info->parse should be
|
||||||
|
* removed along with it.
|
||||||
|
*/
|
||||||
|
if (!prop || !prop->info->parse) {
|
||||||
fprintf(stderr, "property \"%s.%s\" not found\n",
|
fprintf(stderr, "property \"%s.%s\" not found\n",
|
||||||
dev->info->name, name);
|
dev->info->name, name);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (!prop->info->parse) {
|
|
||||||
fprintf(stderr, "property \"%s.%s\" has no parser\n",
|
|
||||||
dev->info->name, name);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
ret = prop->info->parse(dev, prop, value);
|
ret = prop->info->parse(dev, prop, value);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
switch (ret) {
|
switch (ret) {
|
||||||
|
|
15
hw/qdev.c
15
hw/qdev.c
|
@ -180,6 +180,15 @@ int qdev_device_help(QemuOpts *opts)
|
||||||
}
|
}
|
||||||
|
|
||||||
for (prop = info->props; prop && prop->name; prop++) {
|
for (prop = info->props; prop && prop->name; prop++) {
|
||||||
|
/*
|
||||||
|
* TODO Properties without a parser are just for dirty hacks.
|
||||||
|
* qdev_prop_ptr is the only such PropertyInfo. It's marked
|
||||||
|
* for removal. This conditional should be removed along with
|
||||||
|
* it.
|
||||||
|
*/
|
||||||
|
if (!prop->info->parse) {
|
||||||
|
continue; /* no way to set it, don't show */
|
||||||
|
}
|
||||||
error_printf("%s.%s=%s\n", info->name, prop->name, prop->info->name);
|
error_printf("%s.%s=%s\n", info->name, prop->name, prop->info->name);
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -682,6 +691,12 @@ static void qdev_print_props(Monitor *mon, DeviceState *dev, Property *props,
|
||||||
if (!props)
|
if (!props)
|
||||||
return;
|
return;
|
||||||
while (props->name) {
|
while (props->name) {
|
||||||
|
/*
|
||||||
|
* TODO Properties without a print method are just for dirty
|
||||||
|
* hacks. qdev_prop_ptr is the only such PropertyInfo. It's
|
||||||
|
* marked for removal. The test props->info->print should be
|
||||||
|
* removed along with it.
|
||||||
|
*/
|
||||||
if (props->info->print) {
|
if (props->info->print) {
|
||||||
props->info->print(dev, props, buf, sizeof(buf));
|
props->info->print(dev, props, buf, sizeof(buf));
|
||||||
qdev_printf("%s-prop: %s = %s\n", prefix, props->name, buf);
|
qdev_printf("%s-prop: %s = %s\n", prefix, props->name, buf);
|
||||||
|
|
Loading…
Reference in a new issue