Commit 778358d0 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael Tokarev
Browse files

rocker: Use g_new() & friends where that makes obvious sense 



g_new(T, n) is neater than g_malloc(sizeof(T) * n).  It's also safer,
for two reasons.  One, it catches multiplication overflowing size_t.
Two, it returns T * rather than void *, which lets the compiler catch
more type errors.

This commit only touches allocations with size arguments of the form
sizeof(T).  Same Coccinelle semantic patchas in commit b45c03f5.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent cb157af2

hw/net/rocker/rocker.c

+1 −1
Original line number Diff line number Diff line
@@ -1362,7 +1362,7 @@ static int pci_rocker_init(PCIDevice *dev) 
        r->fp_ports = ROCKER_FP_PORTS_MAX;

    }



    r->rings = g_malloc(sizeof(DescRing *) * rocker_pci_ring_count(r));

    r->rings = g_new(DescRing *, rocker_pci_ring_count(r));

    if (!r->rings) {

        goto err_rings_alloc;

    }

hw/net/rocker/rocker_desc.c

+2 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ bool desc_ring_set_size(DescRing *ring, uint32_t size) 
    ring->size = size;

    ring->head = ring->tail = 0;



    ring->info = g_realloc(ring->info, size * sizeof(DescInfo));

    ring->info = g_renew(DescInfo, ring->info, size);

    if (!ring->info) {

        return false;

    }
@@ -345,7 +345,7 @@ DescRing *desc_ring_alloc(Rocker *r, int index) 
{

    DescRing *ring;



    ring = g_malloc0(sizeof(DescRing));

    ring = g_new0(DescRing, 1);

    if (!ring) {

        return NULL;

    }

hw/net/rocker/rocker_fp.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ FpPort *fp_port_alloc(Rocker *r, char *sw_name, 
                      MACAddr *start_mac, unsigned int index,

                      NICPeers *peers)

{

    FpPort *port = g_malloc0(sizeof(FpPort));

    FpPort *port = g_new0(FpPort, 1);



    if (!port) {

        return NULL;

hw/net/rocker/rocker_of_dpa.c

+4 −5
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static OfDpaFlow *of_dpa_flow_alloc(uint64_t cookie) 
    OfDpaFlow *flow;

    int64_t now = qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) / 1000;



    flow = g_malloc0(sizeof(OfDpaFlow));

    flow = g_new0(OfDpaFlow, 1);

    if (!flow) {

        return NULL;

    }
@@ -811,7 +811,7 @@ static int of_dpa_group_get_stats(OfDpa *of_dpa, uint32_t id) 


static OfDpaGroup *of_dpa_group_alloc(uint32_t id)

{

    OfDpaGroup *group = g_malloc0(sizeof(OfDpaGroup));

    OfDpaGroup *group = g_new0(OfDpaGroup, 1);



    if (!group) {

        return NULL;
@@ -2039,15 +2039,14 @@ static int of_dpa_cmd_add_l2_flood(OfDpa *of_dpa, OfDpaGroup *group, 
    group->l2_flood.group_count =

        rocker_tlv_get_le16(group_tlvs[ROCKER_TLV_OF_DPA_GROUP_COUNT]);



    tlvs = g_malloc0((group->l2_flood.group_count + 1) *

                     sizeof(RockerTlv *));

    tlvs = g_new0(RockerTlv *, group->l2_flood.group_count + 1);

    if (!tlvs) {

        return -ROCKER_ENOMEM;

    }



    g_free(group->l2_flood.group_ids);

    group->l2_flood.group_ids =

        g_malloc0(group->l2_flood.group_count * sizeof(uint32_t));

        g_new0(uint32_t, group->l2_flood.group_count);

    if (!group->l2_flood.group_ids) {

        err = -ROCKER_ENOMEM;

        goto err_out;