From: David Gibson <david@gibson.dropbear.id.au>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
qemu-trivial@nongnu.org, qemu-devel@nongnu.org,
"Markus Armbruster" <armbru@redhat.com>,
qemu-ppc@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: Re: [PATCH] ppc/ppc405_boards: Remove unnecessary NULL check
Date: Sun, 22 Mar 2020 19:46:08 +1100 [thread overview]
Message-ID: <20200322084608.GI781112@umbus.fritz.box> (raw)
In-Reply-To: <20200320155740.5342-1-philmd@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 2480 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-03-22 8:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-20 15:57 [PATCH] ppc/ppc405_boards: Remove unnecessary NULL check Philippe Mathieu-Daudé
2020-03-20 16:16 ` Markus Armbruster
2020-03-22 8:46 ` David Gibson [this message]
2020-03-22 10:06 ` Peter Maydell
2020-03-23 2:34 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200322084608.GI781112@umbus.fritz.box \
--to=david@gibson.dropbear.id.au \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).