| Message ID | 20200320155740.5342-1-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | ppc/ppc405_boards: Remove unnecessary NULL check | expand |
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>
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);
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
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 >
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);
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(-)