motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-03 15:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qdev: remove extraneous error

Browse source 
All callers use error_abort, and even the function itself calls with
error_abort.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200110153039.1379601-4-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2020-01-10 19:30:16 +04:00 • committed by Paolo Bonzini
parent 421720c87c
commit 94d912d192
3 changed files with 17 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hw/core/qdev.c
View file

@ -717,24 +717,17 @@ static void qdev_property_add_legacy(DeviceState *dev, Property *prop,
g_free(name);
}
void qdev_property_add_static(DeviceState *dev, Property *prop,
Error **errp)
void qdev_property_add_static(DeviceState *dev, Property *prop)
{
Error *local_err = NULL;
Object *obj = OBJECT(dev);
if (prop->info->create) {
prop->info->create(obj, prop, &local_err);
prop->info->create(obj, prop, &error_abort);
} else {
object_property_add(obj, prop->name, prop->info->name,
prop->info->get, prop->info->set,
prop->info->release,
prop, &local_err);
}
if (local_err) {
error_propagate(errp, local_err);
return;
prop, &error_abort);
}
object_property_set_description(obj, prop->name,
@ -989,7 +982,7 @@ static void device_initfn(Object *obj)
do {
for (prop = DEVICE_CLASS(class)->props; prop && prop->name; prop++) {
qdev_property_add_legacy(dev, prop, &error_abort);
qdev_property_add_static(dev, prop, &error_abort);
qdev_property_add_static(dev, prop);
}
class = object_class_get_parent(class);
} while (class != object_class_by_name(TYPE_DEVICE));