falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qdev: convert setting device properties to QError

This commit is contained in:
Markus Armbruster 2010-02-19 13:20:23 +01:00
parent 84745d68e7
commit fdcfa190ab
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/qdev-properties.c
View File

@ -548,25 +548,24 @@ int qdev_prop_parse(DeviceState *dev, const char *name, const char *value)
* removed along with it. * removed along with it.
*/ */
if (!prop || !prop->info->parse) { if (!prop || !prop->info->parse) {
fprintf(stderr, "property \"%s.%s\" not found\n", qerror_report(QERR_PROPERTY_NOT_FOUND, dev->info->name, name);
dev->info->name, name);
return -1; 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) {
case -EEXIST: case -EEXIST:
fprintf(stderr, "property \"%s.%s\": \"%s\" is already in use\n", qerror_report(QERR_PROPERTY_VALUE_IN_USE,
dev->info->name, name, value); dev->info->name, name, value);
break; break;
default: default:
case -EINVAL: case -EINVAL:
fprintf(stderr, "property \"%s.%s\": failed to parse \"%s\"\n", qerror_report(QERR_PROPERTY_VALUE_BAD,
dev->info->name, name, value); dev->info->name, name, value);
break; break;
case -ENOENT: case -ENOENT:
fprintf(stderr, "property \"%s.%s\": could not find \"%s\"\n", qerror_report(QERR_PROPERTY_VALUE_NOT_FOUND,
dev->info->name, name, value); dev->info->name, name, value);
break; break;
} }
return -1; return -1;

2
hw/qdev.c
View File

@ -146,8 +146,6 @@ static int set_property(const char *name, const char *value, void *opaque)
return 0; return 0;
if (qdev_prop_parse(dev, name, value) == -1) { if (qdev_prop_parse(dev, name, value) == -1) {
error_report("can't set property \"%s\" to \"%s\" for \"%s\"",
name, value, dev->info->name);
return -1; return -1;
} }
return 0; return 0;