[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v12 01/30] sdhci: use error_propagate(local_err) in
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v12 01/30] sdhci: use error_propagate(local_err) in realize() |
Date: |
Fri, 9 Feb 2018 11:54:01 -0300 |
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>
---
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 b395ac577d..f20a58068b 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1303,10 +1303,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;
}
@@ -1384,9 +1386,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;
}
--
2.16.1
- [Qemu-devel] [PATCH v12 00/30] SDHCI: clean v1/2 Specs, UHS-I cards tuning sequence, Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 01/30] sdhci: use error_propagate(local_err) in realize(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v12 02/30] sdhci: add qtest to check the SD capabilities register, Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 03/30] sdhci: add check_capab_readonly() qtest, Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 04/30] sdhci: add a check_capab_baseclock() qtest, Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 05/30] sdhci: add a check_capab_sdma() qtest, Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 06/30] sdhci: add qtest to check the SD Spec version, Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 07/30] sdhci: add a 'spec_version property' (default to v2), Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 08/30] sdhci: use a numeric value for the default CAPAB register, Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 10/30] sdhci: check the Spec v1 capabilities correctness, Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 09/30] sdhci: simplify sdhci_get_fifolen(), Philippe Mathieu-Daudé, 2018/02/09
- [Qemu-devel] [PATCH v12 12/30] sdhci: Fix 64-bit ADMA2, Philippe Mathieu-Daudé, 2018/02/09