From nobody Mon Feb 9 10:33:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1584353627; cv=none; d=zohomail.com; s=zohoarc; b=hxGcPR27+ARgerhyeoduwZsj0pwoGrsYyVOhncqXMBYw8sfZiRLe6S7ibQiL43Ojm3Fgs0kj7PiiiQg61NpMnShdK3R9ALIxe3FOMzKXb0GMOYJFNpf2XJOgO8Gx675PVxbuevuAiakCCWWr14i3qF8qSzzb3cA8K9xNNPe9ruM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584353627; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=taRoL0HUFoA01KeItERnyhFVxoFZc6ptPXTrDjX7X5A=; b=Ma+Kri/aAccelPaVCfUgTZ2xDVGDEAKiGUh6ergbgwhDxI+6tnmI3z11PVcGfaBcJGr4tpAjME4I4voRurLx+1mp5h8ybATcHSD6il9rWRRseV+VYl5pbgCqJiF8+akIElKaTJDdx1Wko/bb0TxEOrpLOzwJqlwcXCh8QpFvYRk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1584353627767624.2985000212498; Mon, 16 Mar 2020 03:13:47 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-195-HhNgKFGqN9-RpQ1iWxR2yg-1; Mon, 16 Mar 2020 06:13:44 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E87E81083E9B; Mon, 16 Mar 2020 10:13:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B495F907FB; Mon, 16 Mar 2020 10:13:38 +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 613D3182B00E; Mon, 16 Mar 2020 10:13:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02GADasU030256 for ; Mon, 16 Mar 2020 06:13:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id E719293535; Mon, 16 Mar 2020 10:13:36 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DB4392D0C; Mon, 16 Mar 2020 10:13:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584353626; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=taRoL0HUFoA01KeItERnyhFVxoFZc6ptPXTrDjX7X5A=; b=V/PAA6PTqryOwRKPQeiFHRGZSJCv+XsLqnneAdAVo609F4KD/tY8DZxXMoUKb6RMVZf4p1 q9ZJ1CKc9HnEwdexdSqVXLVmpT67Eym308GsDWeLEnmvB7eYcvet8eGtSmZiuTlm0hgVK8 y51zV9sjKfbMKJkVMvOL3Qle3xnrfLA= X-MC-Unique: HhNgKFGqN9-RpQ1iWxR2yg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH v2 5/5] Remove qemuDomainSecretInfoNew Date: Mon, 16 Mar 2020 11:13:07 +0100 Message-Id: <725954384db5cd03c3208f8862fe8de5fb62e6b0.1584353498.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Replace it by a direct call to qemuDomainSecretAESSetupFromSecret. Signed-off-by: Peter Krempa --- src/qemu/qemu_domain.c | 53 +++++++++++------------------------------- 1 file changed, 13 insertions(+), 40 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ba80bb67d2..f74a1b6fb3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1661,33 +1661,6 @@ qemuDomainSecretInfoNewPlain(virSecretUsageType usag= eType, } -/* qemuDomainSecretInfoNew: - * @priv: pointer to domain private object - * @srcAlias: Alias base to use for TLS object - * @usageType: Secret usage type - * @username: username - * @looupDef: lookup def describing secret - * @isLuks: boolean for luks lookup - * - * Helper function to create a secinfo to be used for secinfo consumers. T= his - * sets up encrypted data to be used with qemu's 'secret' object. - * - * Returns @secinfo on success, NULL on failure. Caller is responsible - * to eventually free @secinfo. - */ -static qemuDomainSecretInfoPtr -qemuDomainSecretInfoNew(qemuDomainObjPrivatePtr priv, - const char *srcAlias, - virSecretUsageType usageType, - const char *username, - virSecretLookupTypeDefPtr lookupDef, - bool isLuks) -{ - return qemuDomainSecretAESSetupFromSecret(priv, srcAlias, usageType, u= sername, - lookupDef, isLuks); -} - - /** * qemuDomainSecretInfoTLSNew: * @priv: pointer to domain private object @@ -1714,9 +1687,9 @@ qemuDomainSecretInfoTLSNew(qemuDomainObjPrivatePtr pr= iv, } seclookupdef.type =3D VIR_SECRET_LOOKUP_TYPE_UUID; - return qemuDomainSecretInfoNew(priv, srcAlias, - VIR_SECRET_USAGE_TYPE_TLS, NULL, - &seclookupdef, false); + return qemuDomainSecretAESSetupFromSecret(priv, srcAlias, + VIR_SECRET_USAGE_TYPE_TLS, + NULL, &seclookupdef, false); } @@ -1806,11 +1779,11 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjP= rivatePtr priv, src->auth->use= rname, &src->auth->se= clookupdef); } else { - srcPriv->secinfo =3D qemuDomainSecretInfoNew(priv, authalias, - usageType, - src->auth->username, - &src->auth->seclook= updef, - false); + srcPriv->secinfo =3D qemuDomainSecretAESSetupFromSecret(priv, = authalias, + usageTyp= e, + src->aut= h->username, + &src->au= th->seclookupdef, + false); } if (!srcPriv->secinfo) @@ -1818,11 +1791,11 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjP= rivatePtr priv, } if (hasEnc) { - if (!(srcPriv->encinfo =3D - qemuDomainSecretInfoNew(priv, encalias, - VIR_SECRET_USAGE_TYPE_VOLUME, NULL, - &src->encryption->secrets[0]->secloo= kupdef, - true))) + if (!(srcPriv->encinfo =3D qemuDomainSecretAESSetupFromSecret(priv= , encalias, + VIR_SE= CRET_USAGE_TYPE_VOLUME, + NULL, + &src->= encryption->secrets[0]->seclookupdef, + true))) return -1; } --=20 2.24.1