SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ppc/ppc405_boards: Remove unnecessary NULL check

Browse Source 
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>
Message-Id: <20200320155740.5342-1-philmd@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Philippe Mathieu-Daudé 2020-03-20 16:57:40 +01:00 committed by David Gibson
parent 235352ee6e
commit 1583794b9b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ppc/ppc405_boards.c
View File

@ -191,7 +191,7 @@ static void ref405ep_init(MachineState *machine)
bios_size = 8 * MiB; bios_size = 8 * MiB;
pflash_cfi02_register((uint32_t)(-bios_size), pflash_cfi02_register((uint32_t)(-bios_size),
"ef405ep.bios", bios_size, "ef405ep.bios", bios_size,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, blk_by_legacy_dinfo(dinfo),
64 * KiB, 1, 64 * KiB, 1,
2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA, 2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
1); 1);
@ -459,7 +459,7 @@ static void taihu_405ep_init(MachineState *machine)
bios_size = 2 * MiB; bios_size = 2 * MiB;
pflash_cfi02_register(0xFFE00000, pflash_cfi02_register(0xFFE00000,
"taihu_405ep.bios", bios_size, "taihu_405ep.bios", bios_size,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, blk_by_legacy_dinfo(dinfo),
64 * KiB, 1, 64 * KiB, 1,
4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
1); 1);
@ -494,7 +494,7 @@ static void taihu_405ep_init(MachineState *machine)
if (dinfo) { if (dinfo) {
bios_size = 32 * MiB; bios_size = 32 * MiB;
pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size, pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, blk_by_legacy_dinfo(dinfo),
64 * KiB, 1, 64 * KiB, 1,
4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x2AA,
1); 1);