Patchwork hw/tc58128.c: Remove unnecessary check for g_malloc failure

login
register
mail settings
Submitter Peter Maydell
Date Nov. 9, 2011, 7:34 p.m.
Message ID <1320867268-10015-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/124680/
State New
Headers show

Comments

Peter Maydell - Nov. 9, 2011, 7:34 p.m.
Remove a check for g_malloc failing: this never happens.
Also use g_malloc rather than g_malloc0 as we immediately
memset the entire region and so zero-initialising it is pointless.
Spotted by Coverity (see bug 887883).

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/tc58128.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
Stefan Hajnoczi - Nov. 10, 2011, 11:35 a.m.
On Wed, Nov 09, 2011 at 07:34:28PM +0000, Peter Maydell wrote:
> Remove a check for g_malloc failing: this never happens.
> Also use g_malloc rather than g_malloc0 as we immediately
> memset the entire region and so zero-initialising it is pointless.
> Spotted by Coverity (see bug 887883).
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/tc58128.c |    6 +-----
>  1 files changed, 1 insertions(+), 5 deletions(-)

Thanks, applied to the trivial patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Stefan
Anthony Liguori - Nov. 11, 2011, 7:45 p.m.
On 11/09/2011 01:34 PM, Peter Maydell wrote:
> Remove a check for g_malloc failing: this never happens.
> Also use g_malloc rather than g_malloc0 as we immediately
> memset the entire region and so zero-initialising it is pointless.
> Spotted by Coverity (see bug 887883).
>
> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>   hw/tc58128.c |    6 +-----
>   1 files changed, 1 insertions(+), 5 deletions(-)
>
> diff --git a/hw/tc58128.c b/hw/tc58128.c
> index ee3ecad..4ce80b1 100644
> --- a/hw/tc58128.c
> +++ b/hw/tc58128.c
> @@ -30,12 +30,8 @@ static void init_dev(tc58128_dev * dev, const char *filename)
>       int ret, blocks;
>
>       dev->state = WAIT;
> -    dev->flash_contents = g_malloc0(FLASH_SIZE);
> +    dev->flash_contents = g_malloc(FLASH_SIZE);
>       memset(dev->flash_contents, 0xff, FLASH_SIZE);
> -    if (!dev->flash_contents) {
> -	fprintf(stderr, "could not alloc memory for flash\n");
> -	exit(1);
> -    }
>       if (filename) {
>   	/* Load flash image skipping the first block */
>   	ret = load_image(filename, dev->flash_contents + 528 * 32);

Patch

diff --git a/hw/tc58128.c b/hw/tc58128.c
index ee3ecad..4ce80b1 100644
--- a/hw/tc58128.c
+++ b/hw/tc58128.c
@@ -30,12 +30,8 @@  static void init_dev(tc58128_dev * dev, const char *filename)
     int ret, blocks;
 
     dev->state = WAIT;
-    dev->flash_contents = g_malloc0(FLASH_SIZE);
+    dev->flash_contents = g_malloc(FLASH_SIZE);
     memset(dev->flash_contents, 0xff, FLASH_SIZE);
-    if (!dev->flash_contents) {
-	fprintf(stderr, "could not alloc memory for flash\n");
-	exit(1);
-    }
     if (filename) {
 	/* Load flash image skipping the first block */
 	ret = load_image(filename, dev->flash_contents + 528 * 32);