From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqFNy-00012B-FI for qemu-devel@nongnu.org; Mon, 09 Dec 2013 23:57:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqFNq-0002ke-Vm for qemu-devel@nongnu.org; Mon, 09 Dec 2013 23:57:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4588) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqFNq-0002kB-Lh for qemu-devel@nongnu.org; Mon, 09 Dec 2013 23:57:22 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBA4vLXJ013072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 9 Dec 2013 23:57:22 -0500 Received: from dreadlord-bne-redhat-com.bne.redhat.com (dhcp-40-7.bne.redhat.com [10.64.40.7]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rBA4vK82018402 for ; Mon, 9 Dec 2013 23:57:21 -0500 From: Dave Airlie Date: Tue, 10 Dec 2013 14:57:20 +1000 Message-Id: <1386651440-9218-1-git-send-email-airlied@gmail.com> Subject: [Qemu-devel] [PATCH] virtio-gpu: use glib alloc/free routines List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Dave Airlie Oh I forgot to fix these up previously. Signed-off-by: Dave Airlie --- hw/display/virtio-gpu.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 7bf2fbb..28dcd1e 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -137,7 +137,7 @@ static void virtgpu_resource_create_2d(VirtIOGPU *g, pixman_format_code_t pformat; struct virtgpu_simple_resource *res; - res = calloc(1, sizeof(struct virtgpu_simple_resource)); + res = g_new0(struct virtgpu_simple_resource, 1); if (!res) return; @@ -159,7 +159,7 @@ static void virtgpu_resource_destroy(struct virtgpu_simple_resource *res) { pixman_image_unref(res->image); QLIST_REMOVE(res, next); - free(res); + g_free(res); } static void virtgpu_resource_unref(VirtIOGPU *g, @@ -310,12 +310,10 @@ static void virtgpu_resource_attach_backing(VirtIOGPU *g, if (!res) return; - res_iovs = malloc(att_rb->nr_entries * sizeof(struct iovec)); - if (!res_iovs) - return; + res_iovs = g_new0(struct iovec, att_rb->nr_entries); if (iov_cnt > 1) { - data = malloc(gsize); + data = g_malloc(gsize); iov_to_buf(iov, iov_cnt, 0, data, gsize); } else data = iov[0].iov_base; @@ -337,7 +335,7 @@ static void virtgpu_resource_attach_backing(VirtIOGPU *g, res->iov_cnt = att_rb->nr_entries; if (iov_cnt > 1) - free(data); + g_free(data); } static void virtgpu_resource_inval_backing(VirtIOGPU *g, @@ -354,7 +352,7 @@ static void virtgpu_resource_inval_backing(VirtIOGPU *g, for (i = 0; i < res->iov_cnt; i++) { cpu_physical_memory_unmap(res->iov[i].iov_base, res->iov[i].iov_len, 1, res->iov[i].iov_len); } - free(res->iov); + g_free(res->iov); res->iov_cnt = 0; res->iov = NULL; } -- 1.8.3.1