[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/48] sdhci: use error_propagate(local_err) in reali
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 14/48] sdhci: use error_propagate(local_err) in realize() |
Date: |
Tue, 13 Feb 2018 13:00:18 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
avoid the "errp && *errp" pattern (not recommended in "qapi/error.h" comments).
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-Id: <address@hidden>
---
hw/sd/sdhci.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index ee95e78..3602286 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1302,10 +1302,12 @@ static Property sdhci_pci_properties[] = {
static void sdhci_pci_realize(PCIDevice *dev, Error **errp)
{
SDHCIState *s = PCI_SDHCI(dev);
+ Error *local_err = NULL;
sdhci_initfn(s);
sdhci_common_realize(s, errp);
- if (errp && *errp) {
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
@@ -1383,9 +1385,11 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error
** errp)
{
SDHCIState *s = SYSBUS_SDHCI(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ Error *local_err = NULL;
sdhci_common_realize(s, errp);
- if (errp && *errp) {
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/48] Misc patches for 2018-02-13, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 03/48] hax: Support guest RAM sizes of 4GB or more, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 05/48] net/can: support for connecting to Linux host SocketCAN interface., Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 02/48] make: fix help message reference to bogus V=0 variable, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 01/48] Revert "build-sys: silence make by default or V=0", Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 04/48] net/can: simple messages transport implementation for QEMU, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 07/48] hw/net/can: Kvaser PCI CAN-S (single SJA1000 channel) emulation, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 10/48] net/can: documentation, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 09/48] hw/net/can: MIOe-3680 PCI (dual SJA1000 channel) emulation, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 08/48] hw/net/can: PCM-3680I PCI (dual SJA1000 channel) emulation, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 14/48] sdhci: use error_propagate(local_err) in realize(),
Paolo Bonzini <=
- [Qemu-devel] [PULL 13/48] build-sys: check static linking of UBSAN, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 17/48] sdhci: add a check_capab_baseclock() qtest, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 06/48] hw/net/can: SJA1000 chip register level emulation for QEMU, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 18/48] sdhci: add a check_capab_sdma() qtest, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 11/48] hw/net/can: interrupt cleanup, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 16/48] sdhci: add check_capab_readonly() qtest, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 15/48] sdhci: add qtest to check the SD capabilities register, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 23/48] sdhci: check the Spec v1 capabilities correctness, Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 27/48] hw/arm/exynos4210: access the 64-bit capareg with qdev_prop_set_uint64(), Paolo Bonzini, 2018/02/13
- [Qemu-devel] [PULL 20/48] sdhci: add a 'spec_version property' (default to v2), Paolo Bonzini, 2018/02/13