Commit 98f34339 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael Tokarev
Browse files

usb: 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 patch as in commit b45c03f5.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent 9de68637

hw/usb/ccid-card-emulated.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void emulated_push_event(EmulatedState *card, EmulEvent *event) 


static void emulated_push_type(EmulatedState *card, uint32_t type)

{

    EmulEvent *event = (EmulEvent *)g_malloc(sizeof(EmulEvent));

    EmulEvent *event = g_new(EmulEvent, 1);



    assert(event);

    event->p.gen.type = type;
@@ -175,7 +175,7 @@ static void emulated_push_type(EmulatedState *card, uint32_t type) 


static void emulated_push_error(EmulatedState *card, uint64_t code)

{

    EmulEvent *event = (EmulEvent *)g_malloc(sizeof(EmulEvent));

    EmulEvent *event = g_new(EmulEvent, 1);



    assert(event);

    event->p.error.type = EMUL_ERROR;

hw/usb/dev-mtp.c

+1 −2
Original line number Diff line number Diff line
@@ -359,8 +359,7 @@ static void usb_mtp_object_readdir(MTPState *s, MTPObject *o) 
    }

    while ((entry = readdir(dir)) != NULL) {

        if ((o->nchildren % 32) == 0) {

            o->children = g_realloc(o->children,

                                    (o->nchildren + 32) * sizeof(MTPObject *));

            o->children = g_renew(MTPObject *, o->children, o->nchildren + 32);

        }

        o->children[o->nchildren] =

            usb_mtp_object_alloc(s, s->next_handle++, o, entry->d_name);

hw/usb/hcd-xhci.c

+1 −1
Original line number Diff line number Diff line
@@ -2188,7 +2188,7 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, 
            xfer->trbs = NULL;

        }

        if (!xfer->trbs) {

            xfer->trbs = g_malloc(sizeof(XHCITRB) * length);

            xfer->trbs = g_new(XHCITRB, length);

            xfer->trb_alloced = length;

        }

        xfer->trb_count = length;

hw/usb/redirect.c

+3 −3
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static void packet_id_queue_add(struct PacketIdQueue *q, uint64_t id) 


    DPRINTF("adding packet id %"PRIu64" to %s queue\n", id, q->name);



    e = g_malloc0(sizeof(struct PacketIdQueueEntry));

    e = g_new0(struct PacketIdQueueEntry, 1);

    e->id = id;

    QTAILQ_INSERT_TAIL(&q->head, e, next);

    q->size++;
@@ -468,7 +468,7 @@ static void bufp_alloc(USBRedirDevice *dev, uint8_t *data, uint16_t len, 
        dev->endpoint[EP2I(ep)].bufpq_dropping_packets = 0;

    }



    bufp = g_malloc(sizeof(struct buf_packet));

    bufp = g_new(struct buf_packet, 1);

    bufp->data   = data;

    bufp->len    = len;

    bufp->offset = 0;
@@ -2234,7 +2234,7 @@ static int usbredir_get_bufpq(QEMUFile *f, void *priv, size_t unused) 


    endp->bufpq_size = qemu_get_be32(f);

    for (i = 0; i < endp->bufpq_size; i++) {

        bufp = g_malloc(sizeof(struct buf_packet));

        bufp = g_new(struct buf_packet, 1);

        bufp->len = qemu_get_be32(f);

        bufp->status = qemu_get_be32(f);

        bufp->offset = 0;