| Message ID | 20180320151355.25854-1-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | sdhci: fix incorrect use of Error * | expand |
On 20 March 2018 at 15:13, Paolo Bonzini <pbonzini@redhat.com> wrote: > Detected by Coverity (CID 1386072, 1386073, 1386076, 1386077). local_err > was unused, and this made the static analyzer unhappy. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hw/sd/sdhci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index 1b828b104d..63c44a4ee8 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -1474,7 +1474,7 @@ static void sdhci_pci_realize(PCIDevice *dev, Error **errp) > Error *local_err = NULL; > > sdhci_initfn(s); > - sdhci_common_realize(s, errp); > + sdhci_common_realize(s, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; > @@ -1556,7 +1556,7 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) > SysBusDevice *sbd = SYS_BUS_DEVICE(dev); > Error *local_err = NULL; > > - sdhci_common_realize(s, errp); > + sdhci_common_realize(s, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return; > -- > 2.16.2 Applied to target-arm.next, thanks. -- PMM
Le 20 mars 2018 4:14 PM, "Paolo Bonzini" <pbonzini@redhat.com> a écrit :
Detected by Coverity (CID 1386072, 1386073, 1386076, 1386077). local_err
was unused, and this made the static analyzer unhappy
Oops, thanks Paolo!
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/sd/sdhci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 1b828b104d..63c44a4ee8 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -1474,7 +1474,7 @@ static void sdhci_pci_realize(PCIDevice *dev, Error
**errp)
Error *local_err = NULL;
sdhci_initfn(s);
- sdhci_common_realize(s, errp);
+ sdhci_common_realize(s, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
@@ -1556,7 +1556,7 @@ static void sdhci_sysbus_realize(DeviceState *dev,
Error ** errp)
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
Error *local_err = NULL;
- sdhci_common_realize(s, errp);
+ sdhci_common_realize(s, &local_err);
if (local_err) {
error_propagate(errp, local_err);
return;
--
2.16.2
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 1b828b104d..63c44a4ee8 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1474,7 +1474,7 @@ static void sdhci_pci_realize(PCIDevice *dev, Error **errp) Error *local_err = NULL; sdhci_initfn(s); - sdhci_common_realize(s, errp); + sdhci_common_realize(s, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -1556,7 +1556,7 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) SysBusDevice *sbd = SYS_BUS_DEVICE(dev); Error *local_err = NULL; - sdhci_common_realize(s, errp); + sdhci_common_realize(s, &local_err); if (local_err) { error_propagate(errp, local_err); return;
Detected by Coverity (CID 1386072, 1386073, 1386076, 1386077). local_err was unused, and this made the static analyzer unhappy. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/sd/sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)