diff options
author | Markus Armbruster <armbru@redhat.com> | 2014-04-25 12:44:23 +0200 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2014-05-05 19:08:49 +0200 |
commit | 0175ba109eb0c098a00903887328393c2e17d4ae (patch) | |
tree | 400ba5c96ecc4d7b21c0dc1fd013b28f0554d608 /hw/intc/arm_gic_kvm.c | |
parent | 65cd9064e13f2388d3bd9c815826f5db6b0b13ec (diff) | |
download | hqemu-0175ba109eb0c098a00903887328393c2e17d4ae.zip hqemu-0175ba109eb0c098a00903887328393c2e17d4ae.tar.gz |
arm: Clean up fragile use of error_is_set() in realize() methods
Using error_is_set(ERRP) to find out whether a function failed is
either wrong, fragile, or unnecessarily opaque. It's wrong when ERRP
may be null, because errors go undetected when it is. It's fragile
when proving ERRP non-null involves a non-local argument. Else, it's
unnecessarily opaque (see commit 84d18f0).
I guess the error_is_set(errp) in the DeviceClass realize() methods
are merely fragile right now, because I can't find a call chain that
passes a null errp argument.
Make the code more robust and more obviously correct: receive the
error in a local variable, then propagate it through the parameter.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/intc/arm_gic_kvm.c')
-rw-r--r-- | hw/intc/arm_gic_kvm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c index 719d227..5038885 100644 --- a/hw/intc/arm_gic_kvm.c +++ b/hw/intc/arm_gic_kvm.c @@ -517,10 +517,12 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp) GICState *s = KVM_ARM_GIC(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); KVMARMGICClass *kgc = KVM_ARM_GIC_GET_CLASS(s); + Error *local_err = NULL; int ret; - kgc->parent_realize(dev, errp); - if (error_is_set(errp)) { + kgc->parent_realize(dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); return; } |