From nobody Thu Apr 25 23:02:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552472097004189.06080419246814; Wed, 13 Mar 2019 03:14:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4C4DC3ED91; Wed, 13 Mar 2019 10:14:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EBA876A95B; Wed, 13 Mar 2019 10:14:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5E28F3FB12; Wed, 13 Mar 2019 10:14:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2DADD7t004106 for ; Wed, 13 Mar 2019 06:13:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id CE4AC45C3; Wed, 13 Mar 2019 10:13:13 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53B094521 for ; Wed, 13 Mar 2019 10:13:13 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 11:13:07 +0100 Message-Id: <893157906859ca2411dea70c63c675fd4ce5316f.1552471966.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] tests: Turn virFileWrapperAddPrefix to void X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Wed, 13 Mar 2019 10:14:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" In theory, it's nice to have virFileWrapperAddPrefix() return a value that indicates if the function succeeded or not. But in practice, nobody checks for that and in fact blindly believes that the function succeeded. Therefore, make the function return nothing and just abort() if it would fail. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety Reviewed-by: Martin Kletzander --- tests/virfilewrapper.c | 13 +++++++------ tests/virfilewrapper.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index f7a7a931e1..497e91bd45 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -66,13 +66,15 @@ static void init_syms(void) } =20 =20 -int +void virFileWrapperAddPrefix(const char *prefix, const char *override) { /* Both parameters are mandatory */ - if (!prefix || !override) - return -1; + if (!prefix || !override) { + fprintf(stderr, "Attempt to add invalid path override\n"); + abort(); + } =20 init_syms(); =20 @@ -80,10 +82,9 @@ virFileWrapperAddPrefix(const char *prefix, VIR_APPEND_ELEMENT_QUIET(overrides, noverrides, override) < 0) { VIR_FREE(prefixes); VIR_FREE(overrides); - return -1; + fprintf(stderr, "Unable to add path override for '%s'\n", prefix); + abort(); } - - return 0; } =20 =20 diff --git a/tests/virfilewrapper.h b/tests/virfilewrapper.h index 044c532232..80fd6244ad 100644 --- a/tests/virfilewrapper.h +++ b/tests/virfilewrapper.h @@ -19,7 +19,7 @@ #ifndef LIBVIRT_VIRFILEWRAPPER_H # define LIBVIRT_VIRFILEWRAPPER_H =20 -int +void virFileWrapperAddPrefix(const char *prefix, const char *override); =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 23:02:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552472120275614.5457056649923; Wed, 13 Mar 2019 03:15:20 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7F6371E317; Wed, 13 Mar 2019 10:15:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4AB9E5D75C; Wed, 13 Mar 2019 10:15:18 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DE9503FAF4; Wed, 13 Mar 2019 10:15:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2DADEp8004117 for ; Wed, 13 Mar 2019 06:13:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id A831E19C65; Wed, 13 Mar 2019 10:13:14 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B3E64521 for ; Wed, 13 Mar 2019 10:13:14 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 11:13:08 +0100 Message-Id: <0e1838373e4db528c28f877e97ee26a0d9484005.1552471966.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] virFileWrapper: Use VIR_AUTOFREE() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 13 Mar 2019 10:15:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This enables us to simplify the code a bit. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- tests/virfilewrapper.c | 81 ++++++++++-------------------------------- 1 file changed, 18 insertions(+), 63 deletions(-) diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index 497e91bd45..88441331ce 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -152,110 +152,74 @@ virFileWrapperOverridePrefix(const char *path) =20 FILE *fopen(const char *path, const char *mode) { - FILE *ret =3D NULL; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_fopen(newpath, mode); - - VIR_FREE(newpath); - - return ret; + return real_fopen(newpath, mode); } =20 int access(const char *path, int mode) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_access(newpath, mode); - - VIR_FREE(newpath); - - return ret; + return real_access(newpath, mode); } =20 # ifdef HAVE___LXSTAT int __lxstat(int ver, const char *path, struct stat *sb) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real___lxstat(ver, newpath, sb); - - VIR_FREE(newpath); - - return ret; + return real___lxstat(ver, newpath, sb); } # endif /* HAVE___LXSTAT */ =20 int lstat(const char *path, struct stat *sb) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_lstat(newpath, sb); - - VIR_FREE(newpath); - - return ret; + return real_lstat(newpath, sb); } =20 # ifdef HAVE___XSTAT int __xstat(int ver, const char *path, struct stat *sb) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real___xstat(ver, newpath, sb); - - VIR_FREE(newpath); - - return ret; + return real___xstat(ver, newpath, sb); } # endif /* HAVE___XSTAT */ =20 int stat(const char *path, struct stat *sb) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_stat(newpath, sb); - - VIR_FREE(newpath); - - return ret; + return real_stat(newpath, sb); } =20 int mkdir(const char *path, mode_t mode) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_mkdir(newpath, mode); - - VIR_FREE(newpath); - - return ret; + return real_mkdir(newpath, mode); } =20 int open(const char *path, int flags, ...) { - int ret =3D -1; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; va_list ap; mode_t mode =3D 0; =20 @@ -270,24 +234,15 @@ int open(const char *path, int flags, ...) va_end(ap); } =20 - ret =3D real_open(newpath, flags, mode); - - VIR_FREE(newpath); - - return ret; + return real_open(newpath, flags, mode); } =20 DIR *opendir(const char *path) { - DIR *ret =3D NULL; - char *newpath =3D NULL; + VIR_AUTOFREE(char *) newpath =3D NULL; =20 PATH_OVERRIDE(newpath, path); =20 - ret =3D real_opendir(newpath); - - VIR_FREE(newpath); - - return ret; + return real_opendir(newpath); } #endif --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Apr 25 23:02:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1552472096466868.749713615478; Wed, 13 Mar 2019 03:14:56 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5077D307E062; Wed, 13 Mar 2019 10:14:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1BEFE5DD84; Wed, 13 Mar 2019 10:14:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1B9E23FB10; Wed, 13 Mar 2019 10:14:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2DADFVC004122 for ; Wed, 13 Mar 2019 06:13:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8069E4521; Wed, 13 Mar 2019 10:13:15 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 04C6B1992A for ; Wed, 13 Mar 2019 10:13:14 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Wed, 13 Mar 2019 11:13:09 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/3] tests: Call virFileWrapperClearPrefixes() for tests using virFileWrapper X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Wed, 13 Mar 2019 10:14:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" This is mostly to avoid a memleak that is not a true memleak anyway - prefixes will be freed by kernel upon test exit. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety Reviewed-by: Martin Kletzander --- tests/qemufirmwaretest.c | 2 ++ tests/qemuxml2argvtest.c | 1 + 2 files changed, 3 insertions(+) diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 3fbeb2b852..340344ebba 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -128,6 +128,8 @@ mymain(void) if (virTestRun("QEMU FW precedence test", testFWPrecedence, NULL) < 0) ret =3D -1; =20 + virFileWrapperClearPrefixes(); + return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index bd9619ae38..03e8d79595 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3044,6 +3044,7 @@ mymain(void) qemuTestDriverFree(&driver); VIR_FREE(fakerootdir); virHashFree(capslatest); + virFileWrapperClearPrefixes(); =20 return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list