From cc597832119dd1504f1c1536bb5f903d8970af2a Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Fri, 20 Aug 2010 21:04:37 +0000 Subject: [PATCH] Replace qemu_malloc + memset with qemu_mallocz Replace a qemu_malloc call, followed by a memset, with qemu_mallocz. Found with this Coccinelle semantic patch, adapted from Coccinelle test package rule 94: @@ type T; expression x; expression E; @@ - x = (T)qemu_malloc(E) + x = qemu_mallocz(E) ... ( - memset(x,0,E); | - memset(x,0,sizeof(*x)); ) Some files (tests/*) had to be filtered out. Signed-off-by: Blue Swirl --- hw/sh_intc.c | 3 +-- hw/virtio-9p.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/sh_intc.c b/hw/sh_intc.c index da36d32b1d..d3f5ea57d5 100644 --- a/hw/sh_intc.c +++ b/hw/sh_intc.c @@ -431,9 +431,8 @@ int sh_intc_init(struct intc_desc *desc, desc->nr_prio_regs = nr_prio_regs; i = sizeof(struct intc_source) * nr_sources; - desc->sources = qemu_malloc(i); + desc->sources = qemu_mallocz(i); - memset(desc->sources, 0, i); for (i = 0; i < desc->nr_sources; i++) { struct intc_source *source = desc->sources + i; diff --git a/hw/virtio-9p.c b/hw/virtio-9p.c index f8c85c3d28..047c7ea4eb 100644 --- a/hw/virtio-9p.c +++ b/hw/virtio-9p.c @@ -1969,9 +1969,8 @@ static void v9fs_wstat_post_chown(V9fsState *s, V9fsWstatState *vs, int err) end = old_name; } - new_name = qemu_malloc(end - old_name + vs->v9stat.name.size + 1); + new_name = qemu_mallocz(end - old_name + vs->v9stat.name.size + 1); - memset(new_name, 0, end - old_name + vs->v9stat.name.size + 1); memcpy(new_name, old_name, end - old_name); memcpy(new_name + (end - old_name), vs->v9stat.name.data, vs->v9stat.name.size);