diff options
author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2014-01-01 18:48:08 -0800 |
---|---|---|
committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-01-06 15:02:30 -0500 |
commit | 5433a0a89e68443c9ce1cd0c7b1af23320133983 (patch) | |
tree | ba5e35a6e5dd2655c087a48a43123cccc17e6ae8 /target-arm/cpu.c | |
parent | 90c3f6e02662d2d8edf059168a037a119ed208cb (diff) |
hw: Remove assert_no_error usages
Replace assert_no_error() usages with the error_abort system.
&error_abort is passed into API calls to signal to the Error sub-system
that any errors are fatal. Removes need for caller assertions.
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'target-arm/cpu.c')
-rw-r--r-- | target-arm/cpu.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 408d207865..e4801a8844 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -252,18 +252,15 @@ static Property arm_cpu_reset_hivecs_property = static void arm_cpu_post_init(Object *obj) { ARMCPU *cpu = ARM_CPU(obj); - Error *err = NULL; if (arm_feature(&cpu->env, ARM_FEATURE_CBAR)) { qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_cbar_property, - &err); - assert_no_error(err); + &error_abort); } if (!arm_feature(&cpu->env, ARM_FEATURE_M)) { qdev_property_add_static(DEVICE(obj), &arm_cpu_reset_hivecs_property, - &err); - assert_no_error(err); + &error_abort); } } |