1. Patchew
  2. QEMU
  3. View series

[PATCH] ppc/ppc405_boards: Remove unnecessary NULL check

Philippe Mathieu-Daudé posted 1 patch 4 years, 1 month ago
Test docker-mingw@fedora passed
Test docker-quick@centos7 passed
Test checkpatch passed
Test FreeBSD passed
Test asan passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200320155740.5342-1-philmd@redhat.com
Maintainers: David Gibson <david@gibson.dropbear.id.au>
hw/ppc/ppc405_boards.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[PATCH] ppc/ppc405_boards: Remove unnecessary NULL check
Posted by Philippe Mathieu-Daudé 4 years, 1 month ago 
This code is inside the "if (dinfo)" condition, so testing
again here whether it is NULL is unnecessary.

Fixes: dd59bcae7 (Don't size flash memory to match backing image)
Reported-by: Coverity (CID 1421917)
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 hw/ppc/ppc405_boards.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index e6bffb9e1a..6198ec1035 100644
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -191,7 +191,7 @@ static void ref405ep_init(MachineState *machine)
         bios_size = 8 * MiB;
         pflash_cfi02_register((uint32_t)(-bios_size),
                               "ef405ep.bios", bios_size,
-                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
+                              blk_by_legacy_dinfo(dinfo),
                               64 * KiB, 1,
                               2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
                               1);
@@ -459,7 +459,7 @@ static void taihu_405ep_init(MachineState *machine)
         bios_size = 2 * MiB;
         pflash_cfi02_register(0xFFE00000,
                               "taihu_405ep.bios", bios_size,
-                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
+                              blk_by_legacy_dinfo(dinfo),
                               64 * KiB, 1,
                               4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
                               1);
@@ -494,7 +494,7 @@ static void taihu_405ep_init(MachineState *machine)
     if (dinfo) {
         bios_size = 32 * MiB;
         pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size,
-                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
+                              blk_by_legacy_dinfo(dinfo),
                               64 * KiB, 1,
                               4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
                               1);
-- 
2.21.1
Re: [PATCH] ppc/ppc405_boards: Remove unnecessary NULL check
Posted by Markus Armbruster 4 years, 1 month ago 
Philippe Mathieu-Daudé <philmd@redhat.com> writes:

> This code is inside the "if (dinfo)" condition, so testing
> again here whether it is NULL is unnecessary.
>
> Fixes: dd59bcae7 (Don't size flash memory to match backing image)
> Reported-by: Coverity (CID 1421917)
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  hw/ppc/ppc405_boards.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index e6bffb9e1a..6198ec1035 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -191,7 +191,7 @@ static void ref405ep_init(MachineState *machine)
>          bios_size = 8 * MiB;
>          pflash_cfi02_register((uint32_t)(-bios_size),
>                                "ef405ep.bios", bios_size,
> -                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> +                              blk_by_legacy_dinfo(dinfo),
>                                64 * KiB, 1,
>                                2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
>                                1);
> @@ -459,7 +459,7 @@ static void taihu_405ep_init(MachineState *machine)
>          bios_size = 2 * MiB;
>          pflash_cfi02_register(0xFFE00000,
>                                "taihu_405ep.bios", bios_size,
> -                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> +                              blk_by_legacy_dinfo(dinfo),
>                                64 * KiB, 1,
>                                4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
>                                1);
> @@ -494,7 +494,7 @@ static void taihu_405ep_init(MachineState *machine)
>      if (dinfo) {
>          bios_size = 32 * MiB;
>          pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size,
> -                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> +                              blk_by_legacy_dinfo(dinfo),
>                                64 * KiB, 1,
>                                4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
>                                1);

Reviewed-by: Markus Armbruster <armbru@redhat.com>
Re: [PATCH] ppc/ppc405_boards: Remove unnecessary NULL check
Posted by David Gibson 4 years, 1 month ago 
On Fri, Mar 20, 2020 at 04:57:40PM +0100, Philippe Mathieu-Daudé wrote:
> This code is inside the "if (dinfo)" condition, so testing
> again here whether it is NULL is unnecessary.
> 
> Fixes: dd59bcae7 (Don't size flash memory to match backing image)
> Reported-by: Coverity (CID 1421917)
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Applied to ppc-for-5.1.

> ---
>  hw/ppc/ppc405_boards.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
> index e6bffb9e1a..6198ec1035 100644
> --- a/hw/ppc/ppc405_boards.c
> +++ b/hw/ppc/ppc405_boards.c
> @@ -191,7 +191,7 @@ static void ref405ep_init(MachineState *machine)
>          bios_size = 8 * MiB;
>          pflash_cfi02_register((uint32_t)(-bios_size),
>                                "ef405ep.bios", bios_size,
> -                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> +                              blk_by_legacy_dinfo(dinfo),
>                                64 * KiB, 1,
>                                2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
>                                1);
> @@ -459,7 +459,7 @@ static void taihu_405ep_init(MachineState *machine)
>          bios_size = 2 * MiB;
>          pflash_cfi02_register(0xFFE00000,
>                                "taihu_405ep.bios", bios_size,
> -                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> +                              blk_by_legacy_dinfo(dinfo),
>                                64 * KiB, 1,
>                                4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
>                                1);
> @@ -494,7 +494,7 @@ static void taihu_405ep_init(MachineState *machine)
>      if (dinfo) {
>          bios_size = 32 * MiB;
>          pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size,
> -                              dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
> +                              blk_by_legacy_dinfo(dinfo),
>                                64 * KiB, 1,
>                                4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
>                                1);

-- 
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
Re: [PATCH] ppc/ppc405_boards: Remove unnecessary NULL check
Posted by Peter Maydell 4 years, 1 month ago 
On Sun, 22 Mar 2020 at 08:50, David Gibson <david@gibson.dropbear.id.au> wrote:
>
> On Fri, Mar 20, 2020 at 04:57:40PM +0100, Philippe Mathieu-Daudé wrote:
> > This code is inside the "if (dinfo)" condition, so testing
> > again here whether it is NULL is unnecessary.
> >
> > Fixes: dd59bcae7 (Don't size flash memory to match backing image)
> > Reported-by: Coverity (CID 1421917)
> > Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> Applied to ppc-for-5.1.

This would be OK for 5.0 too at this stage.

thanks
-- PMM
Re: [PATCH] ppc/ppc405_boards: Remove unnecessary NULL check
Posted by David Gibson 4 years, 1 month ago 
On Sun, Mar 22, 2020 at 10:06:13AM +0000, Peter Maydell wrote:
> On Sun, 22 Mar 2020 at 08:50, David Gibson <david@gibson.dropbear.id.au> wrote:
> >
> > On Fri, Mar 20, 2020 at 04:57:40PM +0100, Philippe Mathieu-Daudé wrote:
> > > This code is inside the "if (dinfo)" condition, so testing
> > > again here whether it is NULL is unnecessary.
> > >
> > > Fixes: dd59bcae7 (Don't size flash memory to match backing image)
> > > Reported-by: Coverity (CID 1421917)
> > > Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> >
> > Applied to ppc-for-5.1.
> 
> This would be OK for 5.0 too at this stage.

Understood, I've moved this into the ppc-for-5.0 tree.

> 
> thanks
> -- PMM
> 

-- 
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

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.