From nobody Tue May 21 07:03:48 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=crudebyte.com ARC-Seal: i=1; a=rsa-sha256; t=1637081597; cv=none; d=zohomail.com; s=zohoarc; b=XoBvBhc4eNrL1b4ih/tUTIAoSjacdiZx0GVTwxc28KCkTdeI7D4OpGEu4eCTQRjnFbtGsUaTPvx/Rs8GIyaTDXXnymEoTKwXPTVLnDPg/H5tAgs5RLVjLvNWtK5cVpshIzKi1/a8bPPzVIaUpOtUszgRSedk+Ft9XPTyGO/n3Sc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637081597; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=DKoS+WVCLJN9x7hR8oYFacdolXb2/UZFzxE5I4qvKfk=; b=WI4/V1SLFhEGLXQ/IYOxdiLhq71tlPnkIh2sQ6mPfGeHwKynLPiIcqA8XQWuL92uovxlteHAem256v/Kl1xhAffNHafZEGIkrBaL/ETlw1+XESOOcpDlGkWk78KHsltQwdGDFu59pJpxWIykdTAuE1NiqgVFjYuh1MGHXATeX7k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1637081597388550.2735734390434; Tue, 16 Nov 2021 08:53:17 -0800 (PST) Received: from localhost ([::1]:40180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn1hs-0001jZ-4l for importer@patchew.org; Tue, 16 Nov 2021 11:53:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <1c5561ac645288605cb165f9a42eaa2edade2763@lizzy.crudebyte.com>) id 1mn1gK-0000Vt-Rq for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:51:41 -0500 Received: from lizzy.crudebyte.com ([91.194.90.13]:38969) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <1c5561ac645288605cb165f9a42eaa2edade2763@lizzy.crudebyte.com>) id 1mn1gB-0008HG-6F for qemu-devel@nongnu.org; Tue, 16 Nov 2021 11:51:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=lizzy; h=Message-Id:Cc:To:Subject:Date:From:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Content-ID: Content-Description; bh=DKoS+WVCLJN9x7hR8oYFacdolXb2/UZFzxE5I4qvKfk=; b=a0A9t iZOFs9oMRZilyLoXfob8cClPRqjajyWhWMa5rF3VKjHaLQR4yxINeu1LsRfDxkUf3NSaOWmzxy9vp fHOHYvGtBKN2ml9WBElWCJ6qNsflmdetUukF6VowOt0w7JZE6RBmJwCGZ2IYdjJGmt4hjb7Ql13+z sI0v1FQAZhf2Viveubg6nLpP4VwXVyrIf4D1AlrmJknxCrseMTYQHfdKpEG63LCm9DH+YlJQzy/Xz cs2x1mT+ZxZQx4W15+q82OgTHSNXFxPG4p6wIRMqSdMa+A/zjWX4siBPz0AyZFkBQ5TLOkZk7w41h BVALKbAUUQ/vFWqdbmxP5axiMXz/g==; From: Christian Schoenebeck Date: Tue, 16 Nov 2021 17:40:08 +0100 Subject: [PATCH] tests/9pfs: use g_autofree where possible To: qemu-devel@nongnu.org Cc: Greg Kurz Message-Id: Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=91.194.90.13; envelope-from=1c5561ac645288605cb165f9a42eaa2edade2763@lizzy.crudebyte.com; helo=lizzy.crudebyte.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @crudebyte.com) X-ZM-MESSAGEID: 1637081598171100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Christian Schoenebeck Reviewed-by: Greg Kurz --- tests/qtest/virtio-9p-test.c | 86 +++++++++++------------------------- 1 file changed, 25 insertions(+), 61 deletions(-) diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index 41fed41de1..11861aaf7d 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -84,7 +84,7 @@ static void pci_config(void *obj, void *data, QGuestAlloc= ator *t_alloc) QVirtio9P *v9p =3D obj; alloc =3D t_alloc; size_t tag_len =3D qvirtio_config_readw(v9p->vdev, 0); - char *tag; + g_autofree char *tag =3D NULL; int i; =20 g_assert_cmpint(tag_len, =3D=3D, strlen(MOUNT_TAG)); @@ -94,7 +94,6 @@ static void pci_config(void *obj, void *data, QGuestAlloc= ator *t_alloc) tag[i] =3D qvirtio_config_readb(v9p->vdev, i + 2); } g_assert_cmpmem(tag, tag_len, MOUNT_TAG, tag_len); - g_free(tag); } =20 #define P9_MAX_SIZE 4096 /* Max size of a T-message or R-message */ @@ -580,7 +579,7 @@ static void do_version(QVirtio9P *v9p) { const char *version =3D "9P2000.L"; uint16_t server_len; - char *server_version; + g_autofree char *server_version =3D NULL; P9Req *req; =20 req =3D v9fs_tversion(v9p, P9_MAX_SIZE, version, P9_NOTAG); @@ -588,8 +587,6 @@ static void do_version(QVirtio9P *v9p) v9fs_rversion(req, &server_len, &server_version); =20 g_assert_cmpmem(server_version, server_len, version, strlen(version)); - - g_free(server_version); } =20 /* utility function: walk to requested dir and return fid for that dir */ @@ -637,7 +634,7 @@ static void fs_walk(void *obj, void *data, QGuestAlloca= tor *t_alloc) alloc =3D t_alloc; char *wnames[P9_MAXWELEM]; uint16_t nwqid; - v9fs_qid *wqid; + g_autofree v9fs_qid *wqid =3D NULL; int i; P9Req *req; =20 @@ -655,8 +652,6 @@ static void fs_walk(void *obj, void *data, QGuestAlloca= tor *t_alloc) for (i =3D 0; i < P9_MAXWELEM; i++) { g_free(wnames[i]); } - - g_free(wqid); } =20 static bool fs_dirents_contain_name(struct V9fsDirent *e, const char* name) @@ -984,7 +979,8 @@ static void fs_walk_dotdot(void *obj, void *data, QGues= tAllocator *t_alloc) QVirtio9P *v9p =3D obj; alloc =3D t_alloc; char *const wnames[] =3D { g_strdup("..") }; - v9fs_qid root_qid, *wqid; + v9fs_qid root_qid; + g_autofree v9fs_qid *wqid =3D NULL; P9Req *req; =20 do_version(v9p); @@ -998,7 +994,6 @@ static void fs_walk_dotdot(void *obj, void *data, QGues= tAllocator *t_alloc) =20 g_assert_cmpmem(&root_qid, 13, wqid[0], 13); =20 - g_free(wqid); g_free(wnames[0]); } =20 @@ -1027,7 +1022,7 @@ static void fs_write(void *obj, void *data, QGuestAll= ocator *t_alloc) alloc =3D t_alloc; static const uint32_t write_count =3D P9_MAX_SIZE / 2; char *const wnames[] =3D { g_strdup(QTEST_V9FS_SYNTH_WRITE_FILE) }; - char *buf =3D g_malloc0(write_count); + g_autofree char *buf =3D g_malloc0(write_count); uint32_t count; P9Req *req; =20 @@ -1045,7 +1040,6 @@ static void fs_write(void *obj, void *data, QGuestAll= ocator *t_alloc) v9fs_rwrite(req, &count); g_assert_cmpint(count, =3D=3D, write_count); =20 - g_free(buf); g_free(wnames[0]); } =20 @@ -1125,7 +1119,7 @@ static void fs_flush_ignored(void *obj, void *data, Q= GuestAllocator *t_alloc) =20 static void do_mkdir(QVirtio9P *v9p, const char *path, const char *cname) { - char *const name =3D g_strdup(cname); + g_autofree char *name =3D g_strdup(cname); uint32_t fid; P9Req *req; =20 @@ -1134,15 +1128,13 @@ static void do_mkdir(QVirtio9P *v9p, const char *pa= th, const char *cname) req =3D v9fs_tmkdir(v9p, fid, name, 0750, 0, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rmkdir(req, NULL); - - g_free(name); } =20 /* create a regular file with Tlcreate and return file's fid */ static uint32_t do_lcreate(QVirtio9P *v9p, const char *path, const char *cname) { - char *const name =3D g_strdup(cname); + g_autofree char *name =3D g_strdup(cname); uint32_t fid; P9Req *req; =20 @@ -1152,7 +1144,6 @@ static uint32_t do_lcreate(QVirtio9P *v9p, const char= *path, v9fs_req_wait_for_reply(req, NULL); v9fs_rlcreate(req, NULL, NULL); =20 - g_free(name); return fid; } =20 @@ -1160,8 +1151,8 @@ static uint32_t do_lcreate(QVirtio9P *v9p, const char= *path, static void do_symlink(QVirtio9P *v9p, const char *path, const char *clink, const char *to) { - char *const name =3D g_strdup(clink); - char *const dst =3D g_strdup(to); + g_autofree char *name =3D g_strdup(clink); + g_autofree char *dst =3D g_strdup(to); uint32_t fid; P9Req *req; =20 @@ -1170,9 +1161,6 @@ static void do_symlink(QVirtio9P *v9p, const char *pa= th, const char *clink, req =3D v9fs_tsymlink(v9p, fid, name, dst, 0, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rsymlink(req, NULL); - - g_free(dst); - g_free(name); } =20 /* create a hard link named @a clink in directory @a path pointing to @a t= o */ @@ -1193,7 +1181,7 @@ static void do_hardlink(QVirtio9P *v9p, const char *p= ath, const char *clink, static void do_unlinkat(QVirtio9P *v9p, const char *atpath, const char *rp= ath, uint32_t flags) { - char *const name =3D g_strdup(rpath); + g_autofree char *name =3D g_strdup(rpath); uint32_t fid; P9Req *req; =20 @@ -1202,8 +1190,6 @@ static void do_unlinkat(QVirtio9P *v9p, const char *a= tpath, const char *rpath, req =3D v9fs_tunlinkat(v9p, fid, name, flags, 0); v9fs_req_wait_for_reply(req, NULL); v9fs_runlinkat(req); - - g_free(name); } =20 static void fs_readdir_split_128(void *obj, void *data, @@ -1235,8 +1221,8 @@ static void fs_create_dir(void *obj, void *data, QGue= stAllocator *t_alloc) QVirtio9P *v9p =3D obj; alloc =3D t_alloc; struct stat st; - char *root_path =3D virtio_9p_test_path(""); - char *new_dir =3D virtio_9p_test_path("01"); + g_autofree char *root_path =3D virtio_9p_test_path(""); + g_autofree char *new_dir =3D virtio_9p_test_path("01"); =20 g_assert(root_path !=3D NULL); =20 @@ -1247,9 +1233,6 @@ static void fs_create_dir(void *obj, void *data, QGue= stAllocator *t_alloc) g_assert(stat(new_dir, &st) =3D=3D 0); /* ... and is actually a directory */ g_assert((st.st_mode & S_IFMT) =3D=3D S_IFDIR); - - g_free(new_dir); - g_free(root_path); } =20 static void fs_unlinkat_dir(void *obj, void *data, QGuestAllocator *t_allo= c) @@ -1257,8 +1240,8 @@ static void fs_unlinkat_dir(void *obj, void *data, QG= uestAllocator *t_alloc) QVirtio9P *v9p =3D obj; alloc =3D t_alloc; struct stat st; - char *root_path =3D virtio_9p_test_path(""); - char *new_dir =3D virtio_9p_test_path("02"); + g_autofree char *root_path =3D virtio_9p_test_path(""); + g_autofree char *new_dir =3D virtio_9p_test_path("02"); =20 g_assert(root_path !=3D NULL); =20 @@ -1273,9 +1256,6 @@ static void fs_unlinkat_dir(void *obj, void *data, QG= uestAllocator *t_alloc) do_unlinkat(v9p, "/", "02", AT_REMOVEDIR); /* directory should be gone now */ g_assert(stat(new_dir, &st) !=3D 0); - - g_free(new_dir); - g_free(root_path); } =20 static void fs_create_file(void *obj, void *data, QGuestAllocator *t_alloc) @@ -1283,7 +1263,7 @@ static void fs_create_file(void *obj, void *data, QGu= estAllocator *t_alloc) QVirtio9P *v9p =3D obj; alloc =3D t_alloc; struct stat st; - char *new_file =3D virtio_9p_test_path("03/1st_file"); + g_autofree char *new_file =3D virtio_9p_test_path("03/1st_file"); =20 do_attach(v9p); do_mkdir(v9p, "/", "03"); @@ -1293,8 +1273,6 @@ static void fs_create_file(void *obj, void *data, QGu= estAllocator *t_alloc) g_assert(stat(new_file, &st) =3D=3D 0); /* ... and is a regular file */ g_assert((st.st_mode & S_IFMT) =3D=3D S_IFREG); - - g_free(new_file); } =20 static void fs_unlinkat_file(void *obj, void *data, QGuestAllocator *t_all= oc) @@ -1302,7 +1280,7 @@ static void fs_unlinkat_file(void *obj, void *data, Q= GuestAllocator *t_alloc) QVirtio9P *v9p =3D obj; alloc =3D t_alloc; struct stat st; - char *new_file =3D virtio_9p_test_path("04/doa_file"); + g_autofree char *new_file =3D virtio_9p_test_path("04/doa_file"); =20 do_attach(v9p); do_mkdir(v9p, "/", "04"); @@ -1316,8 +1294,6 @@ static void fs_unlinkat_file(void *obj, void *data, Q= GuestAllocator *t_alloc) do_unlinkat(v9p, "04", "doa_file", 0); /* file should be gone now */ g_assert(stat(new_file, &st) !=3D 0); - - g_free(new_file); } =20 static void fs_symlink_file(void *obj, void *data, QGuestAllocator *t_allo= c) @@ -1325,8 +1301,8 @@ static void fs_symlink_file(void *obj, void *data, QG= uestAllocator *t_alloc) QVirtio9P *v9p =3D obj; alloc =3D t_alloc; struct stat st; - char *real_file =3D virtio_9p_test_path("05/real_file"); - char *symlink_file =3D virtio_9p_test_path("05/symlink_file"); + g_autofree char *real_file =3D virtio_9p_test_path("05/real_file"); + g_autofree char *symlink_file =3D virtio_9p_test_path("05/symlink_file= "); =20 do_attach(v9p); do_mkdir(v9p, "/", "05"); @@ -1338,9 +1314,6 @@ static void fs_symlink_file(void *obj, void *data, QG= uestAllocator *t_alloc) =20 /* check if created link exists now */ g_assert(stat(symlink_file, &st) =3D=3D 0); - - g_free(symlink_file); - g_free(real_file); } =20 static void fs_unlinkat_symlink(void *obj, void *data, @@ -1349,8 +1322,8 @@ static void fs_unlinkat_symlink(void *obj, void *data, QVirtio9P *v9p =3D obj; alloc =3D t_alloc; struct stat st; - char *real_file =3D virtio_9p_test_path("06/real_file"); - char *symlink_file =3D virtio_9p_test_path("06/symlink_file"); + g_autofree char *real_file =3D virtio_9p_test_path("06/real_file"); + g_autofree char *symlink_file =3D virtio_9p_test_path("06/symlink_file= "); =20 do_attach(v9p); do_mkdir(v9p, "/", "06"); @@ -1364,9 +1337,6 @@ static void fs_unlinkat_symlink(void *obj, void *data, do_unlinkat(v9p, "06", "symlink_file", 0); /* symlink should be gone now */ g_assert(stat(symlink_file, &st) !=3D 0); - - g_free(symlink_file); - g_free(real_file); } =20 static void fs_hardlink_file(void *obj, void *data, QGuestAllocator *t_all= oc) @@ -1374,8 +1344,8 @@ static void fs_hardlink_file(void *obj, void *data, Q= GuestAllocator *t_alloc) QVirtio9P *v9p =3D obj; alloc =3D t_alloc; struct stat st_real, st_link; - char *real_file =3D virtio_9p_test_path("07/real_file"); - char *hardlink_file =3D virtio_9p_test_path("07/hardlink_file"); + g_autofree char *real_file =3D virtio_9p_test_path("07/real_file"); + g_autofree char *hardlink_file =3D virtio_9p_test_path("07/hardlink_fi= le"); =20 do_attach(v9p); do_mkdir(v9p, "/", "07"); @@ -1391,9 +1361,6 @@ static void fs_hardlink_file(void *obj, void *data, Q= GuestAllocator *t_alloc) g_assert((st_link.st_mode & S_IFMT) =3D=3D S_IFREG); g_assert(st_link.st_dev =3D=3D st_real.st_dev); g_assert(st_link.st_ino =3D=3D st_real.st_ino); - - g_free(hardlink_file); - g_free(real_file); } =20 static void fs_unlinkat_hardlink(void *obj, void *data, @@ -1402,8 +1369,8 @@ static void fs_unlinkat_hardlink(void *obj, void *dat= a, QVirtio9P *v9p =3D obj; alloc =3D t_alloc; struct stat st_real, st_link; - char *real_file =3D virtio_9p_test_path("08/real_file"); - char *hardlink_file =3D virtio_9p_test_path("08/hardlink_file"); + g_autofree char *real_file =3D virtio_9p_test_path("08/real_file"); + g_autofree char *hardlink_file =3D virtio_9p_test_path("08/hardlink_fi= le"); =20 do_attach(v9p); do_mkdir(v9p, "/", "08"); @@ -1419,9 +1386,6 @@ static void fs_unlinkat_hardlink(void *obj, void *dat= a, g_assert(stat(hardlink_file, &st_link) !=3D 0); /* and old file should still exist */ g_assert(stat(real_file, &st_real) =3D=3D 0); - - g_free(hardlink_file); - g_free(real_file); } =20 static void *assign_9p_local_driver(GString *cmd_line, void *arg) --=20 2.20.1