From nobody Mon Feb 2 09:26:05 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; 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=1767982610; cv=none; d=zohomail.com; s=zohoarc; b=h0Z6jmkS+HmHO96zeZ3KvExGESTPq1kgNIvC91AbuxUwteGXVi1ri7BKOG4uxk+iO0RY+GuowoPjTjFJ94frxXdJO7golD30n5iqqVaIhtEpGdCvZFkfDsvHXV1Q7oWaGS7wbXeF6br0UJX5AhOgS+BUVPlUpOIUVoGQiQrRyLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767982610; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=si6iM5Q08+odV2itqkAkXBPQ8Cjneuo1vXCrpiaPveg=; b=aP9isDnG/LPBw1OouHO3BnvyP7yFh/aGcggLn4MFADdfGdylq1btyyhnlBqeTye+rxDYR2TnWDr0gPbeLPdeRc+FiY1PqJKZ3HxGL8hssqAukIVPQrEWN2un3GKxq6nq9ir9cArehODhsAeroEvElcHETpZKvCNDzU9PfmLQ4CU= 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 1767982610637461.06300893670027; Fri, 9 Jan 2026 10:16:50 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id B97FE44084; Fri, 9 Jan 2026 13:16:49 -0500 (EST) Received: from [172.19.199.83] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 165D0441C9; Fri, 9 Jan 2026 13:10:26 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 3BCD243E0C; Fri, 9 Jan 2026 13:09:53 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 C4D8C43E0C for ; Fri, 9 Jan 2026 13:09:51 -0500 (EST) Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-333--4Zv4h8-OI-bKzMqSv_uAg-1; Fri, 09 Jan 2026 13:09:50 -0500 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2a09845b7faso38557895ad.3 for ; Fri, 09 Jan 2026 10:09:49 -0800 (PST) Received: from armenon-kvm.armenon-thinkpadp16vgen1.bengluru.csb ([49.36.108.228]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a3e3cc8803sm111020495ad.71.2026.01.09.10.09.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jan 2026 10:09:47 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, 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=1767982191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=si6iM5Q08+odV2itqkAkXBPQ8Cjneuo1vXCrpiaPveg=; b=fGJpHSETTQ5b7z6CZjZCdh6XlJhoa3tXN8bdJpul7uAHtzR6M2cYFaa93c+gigLuLXgLwY imlzef2xBhgxMatySNY7cKZWRwYK9U87ODZCbFSXS44ZuEmtTJmTifHsm3LTEFjXrnFuR0 YLpq65f8dU3m/tiIbKzPGx7nWsJou1c= X-MC-Unique: -4Zv4h8-OI-bKzMqSv_uAg-1 X-Mimecast-MFC-AGG-ID: -4Zv4h8-OI-bKzMqSv_uAg_1767982189 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767982188; x=1768586988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=si6iM5Q08+odV2itqkAkXBPQ8Cjneuo1vXCrpiaPveg=; b=gynPuc+PLOgJON39aZKo2ipIID0Qw/M9byLPovd5gW03v9iJmrLr7vR50qU6e2adYf +iAicY9uUxy2roakEsfhaeVJj/jAuu2GaSXPddMJ260Z0DaWuxLWiohznJQkp6xfHYz0 K+0r2mB6SYgH2Ijcx/svJTP1Jk4CZZy0N9/HRJzz7TMoCzhVIsM2TNyniyalI4yaeLBX l92plyUtZH0lR779NLyBgt4KyZgMqTfV4+eLVTWyFLUj4xKwXSnHmFM5SK+uFnnsz5hL vmU3OEYxRe//wzv+pEbxEsQWf6mlTs3j+e2hY/2tkmBi8iyI0GJ5y9dhGx27BPLnQ72Z blBQ== X-Gm-Message-State: AOJu0YxTPKDh+6ENZ7PqcRu/TqsrtbY8rXP3cNhiTFigUxaOf3i3MIkY XuC17ohKeH+ztv5q2q8zKaFRhDXM6bOX6cb1hxCq6Ttx23OdIY0Tg5WjGBPN6JYWAMR0RVpLTFE TA0b8dN6phGhxrHjpvVtQ/k+DUCcVaD1gCV2gKAxOFtvokCIr0BaGhxoHW+mh+caf2NVRniSt9g EuvIf0d2aTe2B34ZdpH42qkPSYY0yHU7g3ap+8YQA7wA== X-Gm-Gg: AY/fxX5gtSpReDjdLkD+CApCwVUtP3K6iMkoO+l/YLbxVNlOp5e2e25Z0ULkS6AHi6Y 19wxGEdNjksZMJb9dyD38WbiJX8DEyqFNzrPM7hTY/5+cudHWn/aFQYjN1mvkHsJzptWkuYQgMx HKClhDUA1r2Bq0dOqeot2VxXZ/DrhyFu2S3SBXD2zDOBKWCcKIpSP3X76RNoypmsrdOREvEFhvy eV0Kac7oTz8EAusdywhjFamk1PpqSZdinx60e5hAVZ1gSxYSnBPWmrugfcLrdVsJ5gfTvA5sW/J gYJGiOCT/0NaUanXRvjr3bzlYQOuWnutCQM9sWcznasVn9pNuXzusQdMhfvQjIj5kOa0BsqdGdG e8JInq4IkHalvCGN0SqSE/6lLKkIEkF2+UyGfrE91p0F6O7Vnfvs0NWB8Pw== X-Received: by 2002:a17:903:2ec5:b0:29e:9e97:ca70 with SMTP id d9443c01a7336-2a3ee45b3a9mr109913925ad.25.1767982188484; Fri, 09 Jan 2026 10:09:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IHWiFgpgbRR7j2LkrWah0C5BrMjwhYQqiq0N6/o1V23bwLz1Nx/4uxDovs2dDFIJ2wlJjm8og== X-Received: by 2002:a17:903:2ec5:b0:29e:9e97:ca70 with SMTP id d9443c01a7336-2a3ee45b3a9mr109913775ad.25.1767982188074; Fri, 09 Jan 2026 10:09:48 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH v4 4/6] secret: Rename virSecretObj structure attribute from base64File to secretValueFile Date: Fri, 9 Jan 2026 23:39:34 +0530 Message-ID: <20260109180936.127454-5-armenon@redhat.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260109180936.127454-1-armenon@redhat.com> References: <20260109180936.127454-1-armenon@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ym40yRH0z6VVr_8MT1LbZPBx2qzcFOcQga1L3iyTpW8_1767982189 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FHQOAZCGMERCEAJE74HP3NYPBZQBUWXW X-Message-ID-Hash: FHQOAZCGMERCEAJE74HP3NYPBZQBUWXW X-MailFrom: armenon@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 CC: Arun Menon 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: Arun Menon via Devel Reply-To: Arun Menon X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1767982616197158500 Content-Type: text/plain; charset="utf-8"; x-default="true" Change the attribute name of _virSecretObj because we want it to have a gen= eric name to indicate that secret values can be stored in it in both base64 and encrypted formats. Signed-off-by: Arun Menon --- src/conf/virsecretobj.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 66270e2751..a3dd7983bb 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -39,7 +39,7 @@ VIR_LOG_INIT("conf.virsecretobj"); struct _virSecretObj { virObjectLockable parent; char *configFile; - char *base64File; + char *secretValueFile; virSecretDef *def; unsigned char *value; /* May be NULL */ size_t value_size; @@ -139,7 +139,7 @@ virSecretObjDispose(void *opaque) g_free(obj->value); } g_free(obj->configFile); - g_free(obj->base64File); + g_free(obj->secretValueFile); } =20 =20 @@ -378,11 +378,11 @@ virSecretObjListAdd(virSecretObjList *secrets, if (!(obj =3D virSecretObjNew())) goto cleanup; =20 - /* Generate the possible configFile and base64File strings + /* Generate the possible configFile and secretValueFile strings * using the configDir, uuidstr, and appropriate suffix */ if (!(obj->configFile =3D virFileBuildPath(configDir, uuidstr, ".x= ml")) || - !(obj->base64File =3D virFileBuildPath(configDir, uuidstr, ".b= ase64"))) + !(obj->secretValueFile =3D virFileBuildPath(configDir, uuidstr= , ".base64"))) goto cleanup; =20 if (virHashAddEntry(secrets->objs, uuidstr, obj) < 0) @@ -656,7 +656,7 @@ virSecretObjDeleteData(virSecretObj *obj) { /* The configFile will already be removed, so secret won't be * loaded again if this fails */ - unlink(obj->base64File); + unlink(obj->secretValueFile); } =20 =20 @@ -691,7 +691,7 @@ virSecretObjSaveData(virSecretObj *obj) =20 base64 =3D g_base64_encode(obj->value, obj->value_size); =20 - if (virFileRewriteStr(obj->base64File, S_IRUSR | S_IWUSR, base64) < 0) + if (virFileRewriteStr(obj->secretValueFile, S_IRUSR | S_IWUSR, base64)= < 0) return -1; =20 return 0; @@ -813,26 +813,26 @@ virSecretLoadValue(virSecretObj *obj) struct stat st; g_autofree char *contents =3D NULL; =20 - if ((fd =3D open(obj->base64File, O_RDONLY)) =3D=3D -1) { + if ((fd =3D open(obj->secretValueFile, O_RDONLY)) =3D=3D -1) { if (errno =3D=3D ENOENT) { ret =3D 0; goto cleanup; } virReportSystemError(errno, _("cannot open '%1$s'"), - obj->base64File); + obj->secretValueFile); goto cleanup; } =20 if (fstat(fd, &st) < 0) { virReportSystemError(errno, _("cannot stat '%1$s'"), - obj->base64File); + obj->secretValueFile); goto cleanup; } =20 if ((size_t)st.st_size !=3D st.st_size) { virReportError(VIR_ERR_INTERNAL_ERROR, _("'%1$s' file does not fit in memory"), - obj->base64File); + obj->secretValueFile); goto cleanup; } =20 @@ -845,7 +845,7 @@ virSecretLoadValue(virSecretObj *obj) =20 if (saferead(fd, contents, st.st_size) !=3D st.st_size) { virReportSystemError(errno, _("cannot read '%1$s'"), - obj->base64File); + obj->secretValueFile); goto cleanup; } contents[st.st_size] =3D '\0'; --=20 2.51.1