[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/20] arm: Clean up fragile use of error_is_set() in
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 10/20] arm: Clean up fragile use of error_is_set() in realize() methods |
Date: |
Mon, 5 May 2014 21:03:54 +0200 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Acked-by: Peter Maydell <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/intc/arm_gic.c | 6 ++++--
hw/intc/arm_gic_kvm.c | 6 ++++--
hw/intc/armv7m_nvic.c | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 955b8d4..1532ef9 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -797,9 +797,11 @@ static void arm_gic_realize(DeviceState *dev, Error **errp)
GICState *s = ARM_GIC(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
ARMGICClass *agc = ARM_GIC_GET_CLASS(s);
+ Error *local_err = NULL;
- agc->parent_realize(dev, errp);
- if (error_is_set(errp)) {
+ agc->parent_realize(dev, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
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;
}
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index f5b0c3b..9aa8ab2 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -474,14 +474,16 @@ static void armv7m_nvic_realize(DeviceState *dev, Error
**errp)
{
nvic_state *s = NVIC(dev);
NVICClass *nc = NVIC_GET_CLASS(s);
+ Error *local_err = NULL;
/* The NVIC always has only one CPU */
s->gic.num_cpu = 1;
/* Tell the common code we're an NVIC */
s->gic.revision = 0xffffffff;
s->num_irq = s->gic.num_irq;
- nc->parent_realize(dev, errp);
- if (error_is_set(errp)) {
+ nc->parent_realize(dev, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
gic_init_irqs_and_distributor(&s->gic, s->num_irq);
--
1.8.4.5
- [Qemu-devel] [PULL 00/20] QOM devices patch queue 2014-05-05, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 02/20] machine: Remove obsoleted field from QEMUMachine, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 11/20] MAINTAINERS: Document QOM, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 10/20] arm: Clean up fragile use of error_is_set() in realize() methods,
Andreas Färber <=
- [Qemu-devel] [PULL 12/20] qtest: Assure that init_socket()'s listen() does not fail, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 01/20] qdev: Fix crash by validating the object type, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 05/20] machine: Replace QEMUMachine by MachineClass in accelerator configuration, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 13/20] qtest: Add error reporting to socket_accept(), Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 16/20] tests: Add es1370 qtest, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 18/20] tests: Add ioh3420 qtest, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 14/20] qtest: Be paranoid about accept() addrlen argument, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 04/20] vl.c: Replace QEMUMachine with MachineClass in QEMUMachineInitArgs, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 06/20] machine: Remove QEMUMachine indirection from MachineClass, Andreas Färber, 2014/05/05
- [Qemu-devel] [PULL 03/20] machine: Copy QEMUMachine's fields to MachineClass, Andreas Färber, 2014/05/05