ppc440_uc: Fix a copy/paste error

[Qemu-devel] [PATCH] ppc440_uc: Fix a copy/paste error

Posted by Philippe Mathieu-Daudé 7 years, 4 months ago

Missed in 3c409c1927e, hopefully reported by Coverity.

Fixes: Coverity CID 1393788 (Copy-paste error)
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/ppc/ppc440_uc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 0bbaa6844a..09ccda548f 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -935,7 +935,7 @@ static void dcr_write_dma(void *opaque, int dcrn, uint32_t val)
                     if (wptr) {
                         cpu_physical_memory_unmap(wptr, wlen, 1, didx);
                     }
-                    if (wptr) {
+                    if (rptr) {
                         cpu_physical_memory_unmap(rptr, rlen, 0, sidx);
                     }
                 }
-- 
2.18.0

Re: [Qemu-devel] [PATCH] ppc440_uc: Fix a copy/paste error

Posted by BALATON Zoltan 7 years, 4 months ago

On Wed, 4 Jul 2018, Philippe Mathieu-Daudé wrote:
> Missed in 3c409c1927e, hopefully reported by Coverity.

Apparently Coverity did report it and Paolo already notified me about 
that. I was about to send a patch but you were faster. Thank you very 
much.

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>

> Fixes: Coverity CID 1393788 (Copy-paste error)
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/ppc/ppc440_uc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
> index 0bbaa6844a..09ccda548f 100644
> --- a/hw/ppc/ppc440_uc.c
> +++ b/hw/ppc/ppc440_uc.c
> @@ -935,7 +935,7 @@ static void dcr_write_dma(void *opaque, int dcrn, uint32_t val)
>                     if (wptr) {
>                         cpu_physical_memory_unmap(wptr, wlen, 1, didx);
>                     }
> -                    if (wptr) {
> +                    if (rptr) {
>                         cpu_physical_memory_unmap(rptr, rlen, 0, sidx);
>                     }
>                 }
>

Re: [Qemu-devel] [PATCH] ppc440_uc: Fix a copy/paste error

Posted by David Gibson 7 years, 4 months ago

On Wed, Jul 04, 2018 at 06:40:35PM +0200, BALATON Zoltan wrote:
> On Wed, 4 Jul 2018, Philippe Mathieu-Daudé wrote:
> > Missed in 3c409c1927e, hopefully reported by Coverity.
> 
> Apparently Coverity did report it and Paolo already notified me about that.
> I was about to send a patch but you were faster. Thank you very much.
> 
> Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>

Applied to ppc-for-3.0, thanks.

> 
> > Fixes: Coverity CID 1393788 (Copy-paste error)
> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> > ---
> > hw/ppc/ppc440_uc.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
> > index 0bbaa6844a..09ccda548f 100644
> > --- a/hw/ppc/ppc440_uc.c
> > +++ b/hw/ppc/ppc440_uc.c
> > @@ -935,7 +935,7 @@ static void dcr_write_dma(void *opaque, int dcrn, uint32_t val)
> >                     if (wptr) {
> >                         cpu_physical_memory_unmap(wptr, wlen, 1, didx);
> >                     }
> > -                    if (wptr) {
> > +                    if (rptr) {
> >                         cpu_physical_memory_unmap(rptr, rlen, 0, sidx);
> >                     }
> >                 }
> > 


-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson