qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Mahmoud Mandour <ma.mandourr@gmail.com>
To: qemu-devel@nongnu.org
Cc: Mahmoud Mandour <ma.mandourr@gmail.com>
Subject: [PATCH 4/8] virtiofsd: Changed allocations of fuse_session to GLib's functions
Date: Fri, 19 Mar 2021 15:25:23 +0200	[thread overview]
Message-ID: <20210319132527.3118-5-ma.mandourr@gmail.com> (raw)
In-Reply-To: <20210319132527.3118-1-ma.mandourr@gmail.com>

Replaced the allocation and deallocation of fuse_session structs
from calloc() and free() calls to g_new0() and g_free().

Removed the NULL-check and used g_new0() mainly because fuse_session
creation is critical and an exit will occur anyway if fuse_session
allocation failed.

Signed-off-by: Mahmoud Mandour <ma.mandourr@gmail.com>
---
 tools/virtiofsd/fuse_lowlevel.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse_lowlevel.c
index 45527ff703..b0e9ef29a7 100644
--- a/tools/virtiofsd/fuse_lowlevel.c
+++ b/tools/virtiofsd/fuse_lowlevel.c
@@ -2467,7 +2467,7 @@ void fuse_session_destroy(struct fuse_session *se)
     free(se->vu_socket_path);
     se->vu_socket_path = NULL;
 
-    free(se);
+    g_free(se);
 }
 
 
@@ -2490,11 +2490,7 @@ struct fuse_session *fuse_session_new(struct fuse_args *args,
         return NULL;
     }
 
-    se = (struct fuse_session *)calloc(1, sizeof(struct fuse_session));
-    if (se == NULL) {
-        fuse_log(FUSE_LOG_ERR, "fuse: failed to allocate fuse object\n");
-        goto out1;
-    }
+    se = g_new0(struct fuse_session, 1);
     se->fd = -1;
     se->vu_listen_fd = -1;
     se->thread_pool_size = THREAD_POOL_SIZE;
@@ -2550,7 +2546,7 @@ struct fuse_session *fuse_session_new(struct fuse_args *args,
 out4:
     fuse_opt_free_args(args);
 out2:
-    free(se);
+    g_free(se);
 out1:
     return NULL;
 }
-- 
2.25.1



  parent reply	other threads:[~2021-03-19 13:38 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-19 13:25 [PATCH 0/8] virtiofsd: Changed various allocations to GLib functions Mahmoud Mandour
2021-03-19 13:25 ` [PATCH 1/8] virtiofsd: Changed allocations of fuse_req " Mahmoud Mandour
2021-03-23 13:48   ` Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 2/8] virtiofds: Changed allocations of iovec to GLib's functions Mahmoud Mandour
2021-03-23 13:57   ` Stefan Hajnoczi
2021-03-24 12:57     ` Stefan Hajnoczi
2021-03-24 13:32       ` Mahmoud Mandour
2021-03-19 13:25 ` [PATCH 3/8] virtiofsd: Changed fuse_pollhandle allocation " Mahmoud Mandour
2021-03-23 14:03   ` Stefan Hajnoczi
2021-03-19 13:25 ` Mahmoud Mandour [this message]
2021-03-23 14:08   ` [PATCH 4/8] virtiofsd: Changed allocations of fuse_session " Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 5/8] virtiofsd: Changed allocation of lo_map_elems " Mahmoud Mandour
2021-03-23 14:09   ` Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 6/8] virtiofsd: Changed allocations of fv_VuDev & its internals to GLib functions Mahmoud Mandour
2021-03-23 14:10   ` Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 7/8] virtiofsd/passthrough_ll.c: Changed local allocations " Mahmoud Mandour
2021-03-23 14:13   ` Stefan Hajnoczi
2021-03-19 13:25 ` [PATCH 8/8] virtiofsd/fuse_virtio.c: Changed allocations of locals to GLib Mahmoud Mandour
2021-03-23 14:15   ` Stefan Hajnoczi
     [not found]     ` <CAD-LL6iYvHZt8mJZdiHLyUYsDq3kBy0HrTR6_K0x6iCLE1POoA@mail.gmail.com>
2021-03-24 13:00       ` Stefan Hajnoczi
2021-03-19 13:47 ` [PATCH 0/8] virtiofsd: Changed various allocations to GLib functions Mahmoud Mandour
2021-03-22 15:52   ` Stefan Hajnoczi
2021-04-16  8:43     ` Mahmoud Mandour
2021-04-19 14:19       ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210319132527.3118-5-ma.mandourr@gmail.com \
    --to=ma.mandourr@gmail.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).