Commit 6528499f authored by Markus Armbruster's avatar Markus Armbruster Committed by Stefan Hajnoczi
Browse files

g_malloc(0) and g_malloc0(0) return NULL; simplify 



Once upon a time, it was decided that qemu_malloc(0) should abort.
Switching to glib retired that bright idea.  Some code that was added
to cope with it (e.g. in commits 702ef63f, b76b6e95) is still around.
Bury it.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 74cef80c

block/qcow2-refcount.c

+1 −5
Original line number Diff line number Diff line
@@ -737,11 +737,7 @@ int qcow2_update_snapshot_refcount(BlockDriverState *bs, 
     * l1_table_offset when it is the current s->l1_table_offset! Be careful

     * when changing this! */

    if (l1_table_offset != s->l1_table_offset) {

        if (l1_size2 != 0) {

        l1_table = g_malloc0(align_offset(l1_size2, 512));

        } else {

            l1_table = NULL;

        }

        l1_allocated = 1;

        if (bdrv_pread(bs->file, l1_table_offset,

                       l1_table, l1_size2) != l1_size2)

block/vdi.c

+1 −3
Original line number Diff line number Diff line
@@ -443,9 +443,7 @@ static int vdi_open(BlockDriverState *bs, int flags) 


    bmap_size = header.blocks_in_image * sizeof(uint32_t);

    bmap_size = (bmap_size + SECTOR_SIZE - 1) / SECTOR_SIZE;

    if (bmap_size > 0) {

    s->bmap = g_malloc(bmap_size * SECTOR_SIZE);

    }

    ret = bdrv_read(bs->file, s->bmap_sector, (uint8_t *)s->bmap, bmap_size);

    if (ret < 0) {

        goto fail_free_bmap;

hw/9pfs/virtio-9p.c

+1 −5
Original line number Diff line number Diff line
@@ -3101,11 +3101,7 @@ static void v9fs_xattrcreate(void *opaque) 
    xattr_fidp->fs.xattr.flags = flags;

    v9fs_string_init(&xattr_fidp->fs.xattr.name);

    v9fs_string_copy(&xattr_fidp->fs.xattr.name, &name);

    if (size) {

    xattr_fidp->fs.xattr.value = g_malloc(size);

    } else {

        xattr_fidp->fs.xattr.value = NULL;

    }

    err = offset;

    put_fid(pdu, file_fidp);

out_nofid:

hw/vhost.c

+2 −5
Original line number Diff line number Diff line
@@ -269,11 +269,8 @@ static inline void vhost_dev_log_resize(struct vhost_dev* dev, uint64_t size) 
    vhost_log_chunk_t *log;

    uint64_t log_base;

    int r, i;

    if (size) {



    log = g_malloc0(size * sizeof *log);

    } else {

        log = NULL;

    }

    log_base = (uint64_t)(unsigned long)log;

    r = ioctl(dev->control, VHOST_SET_LOG_BASE, &log_base);

    assert(r >= 0);