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 <blauwirbel@gmail.com>

diff --git a/hw/sh_intc.c b/hw/sh_intc.c
index da36d32b1d1207ed0a697e9c154b1de50c76597c..d3f5ea57d51a67c9ac32f04409cef3f4f7058b0a 100644 (file)
--- 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 f8c85c3d28c4a905826a3ec233a9e52a8e004fda..047c7ea4eb7a3200e56c6a37803b28c15808fadd 100644 (file)
--- 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);