ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib 

Replaced the allocation of local variables from malloc() to
GLib allocation functions.

In one instance, dropped the usage to an assert after a malloc()
call and used g_malloc() instead.

Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20210420154643.58439-8-ma.mandourr@gmail.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Mahmoud Mandour 2021-04-20 17:46:42 +02:00 committed by Dr. David Alan Gilbert
parent c9a276f57c
commit 67a010f64c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/virtiofsd/fuse_virtio.c
View File

@ -511,8 +511,7 @@ static void fv_queue_worker(gpointer data, gpointer user_data)
* They're spread over multiple descriptors in a scatter/gather set * They're spread over multiple descriptors in a scatter/gather set
* and we can't trust the guest to keep them still; so copy in/out. * and we can't trust the guest to keep them still; so copy in/out.
*/ */
fbuf.mem = malloc(se->bufsize); fbuf.mem = g_malloc(se->bufsize);
assert(fbuf.mem);
fuse_mutex_init(&req->ch.lock); fuse_mutex_init(&req->ch.lock);
req->ch.fd = -1; req->ch.fd = -1;
@ -564,8 +563,8 @@ static void fv_queue_worker(gpointer data, gpointer user_data)
memcpy(fbuf.mem, &inh, sizeof(struct fuse_in_header)); memcpy(fbuf.mem, &inh, sizeof(struct fuse_in_header));
/* Allocate the bufv, with space for the rest of the iov */ /* Allocate the bufv, with space for the rest of the iov */
pbufv = malloc(sizeof(struct fuse_bufvec) + pbufv = g_try_malloc(sizeof(struct fuse_bufvec) +
sizeof(struct fuse_buf) * out_num); sizeof(struct fuse_buf) * out_num);
if (!pbufv) { if (!pbufv) {
fuse_log(FUSE_LOG_ERR, "%s: pbufv malloc failed\n", fuse_log(FUSE_LOG_ERR, "%s: pbufv malloc failed\n",
__func__); __func__);
@ -622,7 +621,7 @@ static void fv_queue_worker(gpointer data, gpointer user_data)
out: out:
if (allocated_bufv) { if (allocated_bufv) {
free(pbufv); g_free(pbufv);
} }
/* If the request has no reply, still recycle the virtqueue element */ /* If the request has no reply, still recycle the virtqueue element */
@ -641,7 +640,7 @@ out:
} }
pthread_mutex_destroy(&req->ch.lock); pthread_mutex_destroy(&req->ch.lock);
free(fbuf.mem); g_free(fbuf.mem);
free(req); free(req);
} }