summary refs log tree commit diff stats
path: root/hw/net/rocker/rocker_desc.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-09-14 13:52:23 +0200
committerMichael Tokarev <mjt@tls.msk.ru>2015-10-08 19:46:47 +0300
commit778358d0a8f74a76488daea3c1b6fb327d8135b4 (patch)
tree4270571aba22e4f34c8a48589cb3d91dfdd35fc5 /hw/net/rocker/rocker_desc.c
parentcb157af23833ca0762125f34b3fe73cfdbac297e (diff)
downloadfocaccia-qemu-778358d0a8f74a76488daea3c1b6fb327d8135b4.tar.gz
focaccia-qemu-778358d0a8f74a76488daea3c1b6fb327d8135b4.zip
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 b45c03f.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'hw/net/rocker/rocker_desc.c')
-rw-r--r--hw/net/rocker/rocker_desc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c
index b5c0b4a241..5e697b19e3 100644
--- a/hw/net/rocker/rocker_desc.c
+++ b/hw/net/rocker/rocker_desc.c
@@ -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;
     }