[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/19] rocker: Use g_new() & friends where that makes
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 16/19] rocker: Use g_new() & friends where that makes obvious sense |
Date: |
Thu, 8 Oct 2015 19:52:25 +0300 |
From: Markus Armbruster <address@hidden>
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 <address@hidden>
Acked-by: Jiri Pirko <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Jiri Pirko <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/net/rocker/rocker.c | 2 +-
hw/net/rocker/rocker_desc.c | 4 ++--
hw/net/rocker/rocker_fp.c | 2 +-
hw/net/rocker/rocker_of_dpa.c | 9 ++++-----
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 7e7bda4..bb6fdc3 100644
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -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;
}
diff --git a/hw/net/rocker/rocker_desc.c b/hw/net/rocker/rocker_desc.c
index b5c0b4a..5e697b1 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;
}
diff --git a/hw/net/rocker/rocker_fp.c b/hw/net/rocker/rocker_fp.c
index c693ae5..5906396 100644
--- a/hw/net/rocker/rocker_fp.c
+++ b/hw/net/rocker/rocker_fp.c
@@ -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;
diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c
index 874fb01..1ad2791 100644
--- a/hw/net/rocker/rocker_of_dpa.c
+++ b/hw/net/rocker/rocker_of_dpa.c
@@ -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;
--
2.1.4
- [Qemu-devel] [PULL 09/19] target-microblaze: Remove unnecessary variable, (continued)
- [Qemu-devel] [PULL 09/19] target-microblaze: Remove unnecessary variable, Michael Tokarev, 2015/10/08
- [Qemu-devel] [PULL 10/19] target-ppc: Remove unnecessary variable, Michael Tokarev, 2015/10/08
- [Qemu-devel] [PULL 04/19] imx_serial: Generate interrupt on tx empty if enabled, Michael Tokarev, 2015/10/08
- [Qemu-devel] [PULL 17/19] linux-user: Use g_new() & friends where that makes obvious sense, Michael Tokarev, 2015/10/08
- [Qemu-devel] [PULL 07/19] pc: check for underflow in load_linux, Michael Tokarev, 2015/10/08
- [Qemu-devel] [PULL 19/19] tests: Unique test path for /string-visitor/output, Michael Tokarev, 2015/10/08
- [Qemu-devel] [PULL 01/19] Add .dir-locals.el file to configure emacs coding style, Michael Tokarev, 2015/10/08
- [Qemu-devel] [PULL 11/19] MAINTAINERS: Add NSIS file for W32, W64 hosts, Michael Tokarev, 2015/10/08
- [Qemu-devel] [PULL 03/19] sdhci: Change debug prints to compile unconditionally, Michael Tokarev, 2015/10/09
- [Qemu-devel] [PULL 16/19] rocker: Use g_new() & friends where that makes obvious sense,
Michael Tokarev <=
- [Qemu-devel] [PULL 05/19] block/ssh: remove dead code, Michael Tokarev, 2015/10/09
- [Qemu-devel] [PULL 02/19] sdhci: use PRIx64 for uint64_t type, Michael Tokarev, 2015/10/09
- [Qemu-devel] [PULL 12/19] qapi: add missing @, Michael Tokarev, 2015/10/09
- [Qemu-devel] [PULL 15/19] .travis.yml: Run make check for all targets, not just some, Michael Tokarev, 2015/10/09
- [Qemu-devel] [PULL 06/19] pci-assign: do not include sys/io.h, Michael Tokarev, 2015/10/09
- Re: [Qemu-devel] [PULL 00/19] Trivial patches for 2015-10-08, Peter Maydell, 2015/10/09