| Message ID | 1320867268-10015-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | 35914dc7240f7d81e22219217cfa826c2c383e7b |
| Headers | show |
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
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);
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);
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(-)