system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-14 23:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

3
include/hw/qdev-properties.h
View file

@ -253,13 +253,12 @@ void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev,
* qdev_property_add_static: * qdev_property_add_static:
* @dev: Device to add the property to. * @dev: Device to add the property to.
* @prop: The qdev property definition. * @prop: The qdev property definition.
* @errp: location to store error information.
* *
* Add a static QOM property to @dev for qdev property @prop. * Add a static QOM property to @dev for qdev property @prop.
* On error, store error in @errp. Static properties access data in a struct. * On error, store error in @errp. Static properties access data in a struct.
* The type of the QOM property is derived from prop->info. * The type of the QOM property is derived from prop->info.
*/ */
void qdev_property_add_static(DeviceState *dev, Property *prop, Error **errp); void qdev_property_add_static(DeviceState *dev, Property *prop);
void qdev_alias_all_properties(DeviceState *target, Object *source); void qdev_alias_all_properties(DeviceState *target, Object *source);

36
target/arm/cpu.c
View file

@ -1104,26 +1104,22 @@ void arm_cpu_post_init(Object *obj)
if (arm_feature(&cpu->env, ARM_FEATURE_CBAR) || if (arm_feature(&cpu->env, ARM_FEATURE_CBAR) ||
arm_feature(&cpu->env, ARM_FEATURE_CBAR_RO)) { arm_feature(&cpu->env, ARM_FEATURE_CBAR_RO)) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property);
&error_abort);
} }
if (!arm_feature(&cpu->env, ARM_FEATURE_M)) { if (!arm_feature(&cpu->env, ARM_FEATURE_M)) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_hivecs_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_hivecs_property);
&error_abort);
} }
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) { if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_rvbar_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_rvbar_property);
&error_abort);
} }
if (arm_feature(&cpu->env, ARM_FEATURE_EL3)) { if (arm_feature(&cpu->env, ARM_FEATURE_EL3)) {
/* Add the has_el3 state CPU property only if EL3 is allowed. This will /* Add the has_el3 state CPU property only if EL3 is allowed. This will
* prevent "has_el3" from existing on CPUs which cannot support EL3. * prevent "has_el3" from existing on CPUs which cannot support EL3.
*/ */
qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el3_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el3_property);
&error_abort);
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
object_property_add_link(obj, "secure-memory", object_property_add_link(obj, "secure-memory",
@ -1136,8 +1132,7 @@ void arm_cpu_post_init(Object *obj)
} }
if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) { if (arm_feature(&cpu->env, ARM_FEATURE_EL2)) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el2_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_has_el2_property);
&error_abort);
} }
if (arm_feature(&cpu->env, ARM_FEATURE_PMU)) { if (arm_feature(&cpu->env, ARM_FEATURE_PMU)) {
@ -1154,32 +1149,27 @@ void arm_cpu_post_init(Object *obj)
if (arm_feature(&cpu->env, ARM_FEATURE_VFP)) { if (arm_feature(&cpu->env, ARM_FEATURE_VFP)) {
cpu->has_vfp = true; cpu->has_vfp = true;
if (!kvm_enabled()) { if (!kvm_enabled()) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_has_vfp_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_has_vfp_property);
&error_abort);
} }
} }
if (arm_feature(&cpu->env, ARM_FEATURE_NEON)) { if (arm_feature(&cpu->env, ARM_FEATURE_NEON)) {
cpu->has_neon = true; cpu->has_neon = true;
if (!kvm_enabled()) { if (!kvm_enabled()) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_has_neon_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_has_neon_property);
&error_abort);
} }
} }
if (arm_feature(&cpu->env, ARM_FEATURE_M) && if (arm_feature(&cpu->env, ARM_FEATURE_M) &&
arm_feature(&cpu->env, ARM_FEATURE_THUMB_DSP)) { arm_feature(&cpu->env, ARM_FEATURE_THUMB_DSP)) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_has_dsp_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_has_dsp_property);
&error_abort);
} }
if (arm_feature(&cpu->env, ARM_FEATURE_PMSA)) { if (arm_feature(&cpu->env, ARM_FEATURE_PMSA)) {
qdev_property_add_static(DEVICE(obj), &arm_cpu_has_mpu_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_has_mpu_property);
&error_abort);
if (arm_feature(&cpu->env, ARM_FEATURE_V7)) { if (arm_feature(&cpu->env, ARM_FEATURE_V7)) {
qdev_property_add_static(DEVICE(obj), qdev_property_add_static(DEVICE(obj),
&arm_cpu_pmsav7_dregion_property, &arm_cpu_pmsav7_dregion_property);
&error_abort);
} }
} }
@ -1198,12 +1188,10 @@ void arm_cpu_post_init(Object *obj)
NULL, NULL, &error_abort); NULL, NULL, &error_abort);
} }
qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property, qdev_property_add_static(DEVICE(obj), &arm_cpu_cfgend_property);
&error_abort);
if (arm_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER)) { if (arm_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER)) {
qdev_property_add_static(DEVICE(cpu), &arm_cpu_gt_cntfrq_property, qdev_property_add_static(DEVICE(cpu), &arm_cpu_gt_cntfrq_property);
&error_abort);
} }
} }