From nobody Tue Mar 3 04:54:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1771921622; cv=none; d=zohomail.com; s=zohoarc; b=SXcnzDk64iYuYo3Zx6d2lUI6J8eo0tiD8weORU7GtkCGBcA/6EyzaIJUa6gXK8zO9UJv7Lkwk5Bg3xfNOypNObUGDgIG6/qnrc5Rj9IRYqf4TmQjuBaiI+BKZ4Tdd1bPuMlr+5yzChr+4Cq1vw9GqkLtuwN+VFVRtVGfG7GOzM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1771921622; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=VJFria16XPcVDXc7byo5qTamn60eIYTjeSQF+I3BrgI=; b=jKAEQb7Nz726Xz2POrEyuH0+rCQf0gDJLNtdFnu1NqPZMsN4Q0wIKl0sHZsEuLbZyWXAhtn04Ng59ckPCBt9Jt7cZ1m+1wEdqxLAH+wjqCo1BdJ2OT2cfuQFbwxsBWkyB9ZXukHpw3Z6crd8YR+B89oBNQQtEFac/EGG9/AqtEk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1771921622705468.38209581041815; Tue, 24 Feb 2026 00:27:02 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id D6CA841C19; Tue, 24 Feb 2026 03:27:01 -0500 (EST) Received: from [172.19.199.9] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5625741D26; Tue, 24 Feb 2026 03:23:20 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id AF1CC41B48; Tue, 24 Feb 2026 03:22:49 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 278BE41B68 for ; Tue, 24 Feb 2026 03:22:49 -0500 (EST) Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-628-u-4S5j3vOfq5eeLTF5yVHQ-1; Tue, 24 Feb 2026 03:22:47 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4F4961800464 for ; Tue, 24 Feb 2026 08:22:46 +0000 (UTC) Received: from vhost3.router.laine.org (unknown [10.22.64.82]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EAB6D1800465 for ; Tue, 24 Feb 2026 08:22:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HELO_MISC_IP,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1771921368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VJFria16XPcVDXc7byo5qTamn60eIYTjeSQF+I3BrgI=; b=bwoKOo3sjbiEIwrkGMlgSbyGV9jMSOT+GYTIJ8NJS/DT3iv89N3Bt+DjkkcBqTQ1HwvtgJ A942aK81TCxah+gBa/Mzhh0a/GGBPDJWBu8QcbrzsX/VlBdQGtG0fKhOzm4DTtUimzWQo4 xZyRsb4LlDh/86ztvDfSsPZpGGsxUX0= X-MC-Unique: u-4S5j3vOfq5eeLTF5yVHQ-1 X-Mimecast-MFC-AGG-ID: u-4S5j3vOfq5eeLTF5yVHQ_1771921366 To: devel@lists.libvirt.org Subject: [PATCH 4/8] util: rename virGetUserDirectory(ByUID) to virGetUserHomeDirectory(ByUID) Date: Tue, 24 Feb 2026 03:22:38 -0500 Message-ID: <20260224082242.274009-5-laine@redhat.com> In-Reply-To: <20260224082242.274009-1-laine@redhat.com> References: <20260224082242.274009-1-laine@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Wmz-7WysJbz2Nk8EbfnUU6iTxLX9jJbuF-oRKxyVr4s_1771921366 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BBMECDKHNMUWADCTUJ3YFSWKZUZPHDXJ X-Message-ID-Hash: BBMECDKHNMUWADCTUJ3YFSWKZUZPHDXJ X-MailFrom: laine@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Laine Stump via Devel Reply-To: Laine Stump X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1771921624342158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Laine Stump All the other wrapper functions for glib g_get_user_*_dir() have the type of directory (the "*" in that wildcarded name) in the libvirt function name. These functions, on the other hand, call g_get_home_dir(), but the libvirt API is called virGetUserDirectory*(). Let's make it *a bit* closer to consistent (at least the libvirt API names will be consistent with each other, even if glib isn't). Signed-off-by: Laine Stump --- src/libvirt_private.syms | 4 ++-- src/qemu/qemu_interop_config.c | 2 +- src/rpc/virnetclient.c | 4 ++-- src/rpc/virnettlsconfig.c | 2 +- src/util/virutil.c | 10 +++++----- src/util/virutil.h | 4 ++-- src/vbox/vbox_storage.c | 2 +- tools/virt-login-shell-helper.c | 2 +- tools/vsh.c | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b200037189..a2636652ef 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3723,8 +3723,8 @@ virGetSystemPageSize; virGetSystemPageSizeKB; virGetUserCacheDirectory; virGetUserConfigDirectory; -virGetUserDirectory; -virGetUserDirectoryByUID; +virGetUserHomeDirectory; +virGetUserHomeDirectoryByUID; virGetUserID; virGetUserName; virGetUserRuntimeDirectory; diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index 08fb68c901..2280b8a2df 100644 --- a/src/qemu/qemu_interop_config.c +++ b/src/qemu/qemu_interop_config.c @@ -105,7 +105,7 @@ qemuInteropFetchConfigs(const char *name, xdgConfig =3D g_strdup(getenv("XDG_CONFIG_HOME")); =20 if (!xdgConfig) { - g_autofree char *home =3D virGetUserDirectory(); + g_autofree char *home =3D virGetUserHomeDirectory(); =20 xdgConfig =3D g_strdup_printf("%s/.config", home); } diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index ee729d5e62..3ad4655e6e 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -539,7 +539,7 @@ virNetClient *virNetClientNewLibSSH2(const char *host, if (privkeyPath) { privkey =3D g_strdup(privkeyPath); } else { - homedir =3D virGetUserDirectory(); + homedir =3D virGetUserHomeDirectory(); if (virNetClientFindDefaultSshKey(homedir, &privkey) < 0) return NULL; } @@ -604,7 +604,7 @@ virNetClient *virNetClientNewLibssh(const char *host, if (privkeyPath) { privkey =3D g_strdup(privkeyPath); } else { - homedir =3D virGetUserDirectory(); + homedir =3D virGetUserHomeDirectory(); if (virNetClientFindDefaultSshKey(homedir, &privkey) < 0) return NULL; } diff --git a/src/rpc/virnettlsconfig.c b/src/rpc/virnettlsconfig.c index eec20cf6b7..6ad7a02779 100644 --- a/src/rpc/virnettlsconfig.c +++ b/src/rpc/virnettlsconfig.c @@ -36,7 +36,7 @@ VIR_LOG_INIT("rpc.nettlsconfig"); =20 char *virNetTLSConfigUserPKIBaseDir(void) { - g_autofree char *userdir =3D virGetUserDirectory(); + g_autofree char *userdir =3D virGetUserHomeDirectory(); =20 return g_strdup_printf("%s/.pki/libvirt", userdir); } diff --git a/src/util/virutil.c b/src/util/virutil.c index fb64237692..3c0d04c3d7 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -589,7 +589,7 @@ virGetHostnameQuiet(void) =20 =20 char * -virGetUserDirectory(void) +virGetUserHomeDirectory(void) { return g_strdup(g_get_home_dir()); } @@ -753,7 +753,7 @@ static char *virGetGroupEnt(gid_t gid) =20 =20 char * -virGetUserDirectoryByUID(uid_t uid) +virGetUserHomeDirectoryByUID(uid_t uid) { char *ret; virGetUserEnt(uid, NULL, NULL, &ret, NULL, false); @@ -1091,7 +1091,7 @@ virDoesGroupExist(const char *name G_GNUC_UNUSED) =20 # ifdef WIN32 char * -virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED) +virGetUserHomeDirectoryByUID(uid_t uid G_GNUC_UNUSED) { /* Since Windows lacks setuid binaries, and since we already fake * geteuid(), we can safely assume that this is only called when @@ -1111,10 +1111,10 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED) =20 # else /* !WITH_GETPWUID_R && !WIN32 */ char * -virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED) +virGetUserHomeDirectoryByUID(uid_t uid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virGetUserDirectory is not available")); + "%s", _("virGetUserHomeDirectory is not available")); =20 return NULL; } diff --git a/src/util/virutil.h b/src/util/virutil.h index 7e1705e7ce..2accb5777d 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -95,8 +95,8 @@ static inline int pthread_sigmask(int how, char *virGetHostname(void) ATTRIBUTE_MOCKABLE; char *virGetHostnameQuiet(void); =20 -char *virGetUserDirectory(void); -char *virGetUserDirectoryByUID(uid_t uid); +char *virGetUserHomeDirectory(void); +char *virGetUserHomeDirectoryByUID(uid_t uid); char *virGetUserConfigDirectory(void); char *virGetUserCacheDirectory(void); char *virGetUserRuntimeDirectory(void) ATTRIBUTE_MOCKABLE; diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 56be618fb8..72c67d2143 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -445,7 +445,7 @@ vboxStorageVolCreateXML(virStoragePoolPtr pool, =20 /* If target.path isn't given, use default path ~/.VirtualBox/image_na= me */ if (!def->target.path) { - homedir =3D virGetUserDirectory(); + homedir =3D virGetUserHomeDirectory(); def->target.path =3D g_strdup_printf("%s/.VirtualBox/%s", homedir,= def->name); } VBOX_UTF8_TO_UTF16(def->target.path, &hddNameUtf16); diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helpe= r.c index cb59b5dec0..a1c68a1afa 100644 --- a/tools/virt-login-shell-helper.c +++ b/tools/virt-login-shell-helper.c @@ -253,7 +253,7 @@ main(int argc, char **argv) if (!name) goto cleanup; =20 - homedir =3D virGetUserDirectoryByUID(uid); + homedir =3D virGetUserHomeDirectoryByUID(uid); if (!homedir) goto cleanup; =20 diff --git a/tools/vsh.c b/tools/vsh.c index 69d3930e43..18914cc818 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3333,7 +3333,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd) g_autofree char *dir_malloced =3D NULL; =20 if (vshCommandOptStringQuiet(ctl, cmd, "dir", &dir) <=3D 0) - dir =3D dir_malloced =3D virGetUserDirectory(); + dir =3D dir_malloced =3D virGetUserHomeDirectory(); if (!dir) dir =3D "/"; =20 --=20 2.52.0