From nobody Sun Feb 8 23:41:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1664872430; cv=none; d=zohomail.com; s=zohoarc; b=knMFgmW4bNXmGPoIY7w2AKW+T1uleu7n3/QxgNRKqJbfvWDls2u5WY+RZfLri/X9ep0GWnLImUlpb0bgFttFR/KfnuVNLzOBNxSp/LxuCT73EYYsxDakjuF8Cyj77j/Het9BzUogYsVJ1zw/SxcHEtl2xoQOvLLKiT9KMOqIUfo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664872430; h=Content-Type:Content-Transfer-Encoding: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=ebEYA+kvqk7Xbczgol+dkq1zDwlI/YDMRHlZ85EVdsc=; b=W4k1xtulfsMuJtRo5NCaNYe8v9Qn9DKwnFk2kD5sQz3TwHUq0HwxAF9LEoZSHZIT+1fU4aFVrbv1U+eJtail1psDtASExsX9ZNnGQwY6fm4WJleA6v27mDPi0gF6CKxLh//ZPHdC/gGOSCS6S75DBS5l6MZ5Fwa+IhwQPxRuyG0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1664872430144165.54706480048083; Tue, 4 Oct 2022 01:33:50 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-561-gz0TFQI3PvGG-lUl4QQfrw-1; Tue, 04 Oct 2022 04:33:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D45FB86C051; Tue, 4 Oct 2022 08:33:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id C22074221F; Tue, 4 Oct 2022 08:33:39 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4D9EC1947054; Tue, 4 Oct 2022 08:33:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 934A31947054 for ; Tue, 4 Oct 2022 08:33:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7B59640C6EC5; Tue, 4 Oct 2022 08:33:37 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id E923D40C6EC3 for ; Tue, 4 Oct 2022 08:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664872429; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ebEYA+kvqk7Xbczgol+dkq1zDwlI/YDMRHlZ85EVdsc=; b=J1vmKVQsK7wwUToEDKG54O4NHVThAC8uQejzS2lOBMsJSovvbvF+yORkEUjj746YhVf5Kt lkDmJbaoZUeb6M5IeG/HGv5U8r3zucX1JdNyah9UG5uOU/ocvIIlpbWixEIvnMY43oisER 1OViAaEuMTQcC0i2DTiHOhWagGHsLzo= X-MC-Unique: gz0TFQI3PvGG-lUl4QQfrw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 20/43] conf: secret: Provide only virSecretDefParse Date: Tue, 4 Oct 2022 10:32:54 +0200 Message-Id: <13f985ebb68c9fe6c571b11734406568f6594b3d.1664870258.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664872431226100002 Content-Type: text/plain; charset="utf-8" Replace the virSecretDefParseFile/String shims by calls to virSecretDefParse. Signed-off-by: Peter Krempa --- src/conf/secret_conf.c | 14 +------------- src/conf/secret_conf.h | 7 +++++-- src/conf/virsecretobj.c | 2 +- src/libvirt_private.syms | 3 +-- src/secret/secret_driver.c | 2 +- tests/secretxml2xmltest.c | 2 +- 6 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index d41d8157cd..629a4a57f7 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -174,7 +174,7 @@ virSecretParseXML(xmlXPathContext *ctxt) } -static virSecretDef * +virSecretDef * virSecretDefParse(const char *xmlStr, const char *filename, unsigned int flags) @@ -190,18 +190,6 @@ virSecretDefParse(const char *xmlStr, return virSecretParseXML(ctxt); } -virSecretDef * -virSecretDefParseString(const char *xmlStr, - unsigned int flags) -{ - return virSecretDefParse(xmlStr, NULL, flags); -} - -virSecretDef * -virSecretDefParseFile(const char *filename) -{ - return virSecretDefParse(NULL, filename, 0); -} static int virSecretDefFormatUsage(virBuffer *buf, diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index 36d50407fd..dee98899ac 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -35,8 +35,11 @@ struct _virSecretDef { void virSecretDefFree(virSecretDef *def); G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSecretDef, virSecretDefFree); -virSecretDef *virSecretDefParseString(const char *xml, unsigned int flags); -virSecretDef *virSecretDefParseFile(const char *filename); +virSecretDef * +virSecretDefParse(const char *xmlStr, + const char *filename, + unsigned int flags); + char *virSecretDefFormat(const virSecretDef *def); #define VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL \ diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 4032cd1e9a..4929f74155 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -870,7 +870,7 @@ virSecretLoad(virSecretObjList *secrets, virSecretDef *def =3D NULL; virSecretObj *obj =3D NULL; - if (!(def =3D virSecretDefParseFile(path))) + if (!(def =3D virSecretDefParse(NULL, path, 0))) goto cleanup; if (virSecretLoadValidateUUID(def, file) < 0) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c1ecd1ab04..6334cbb448 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1010,8 +1010,7 @@ virObjectEventStateQueue; # conf/secret_conf.h virSecretDefFormat; virSecretDefFree; -virSecretDefParseFile; -virSecretDefParseString; +virSecretDefParse; virSecretUsageTypeFromString; virSecretUsageTypeToString; diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 6328589fa4..bd981a8ace 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -207,7 +207,7 @@ secretDefineXML(virConnectPtr conn, virCheckFlags(VIR_SECRET_DEFINE_VALIDATE, NULL); - if (!(def =3D virSecretDefParseString(xml, flags))) + if (!(def =3D virSecretDefParse(xml, NULL, flags))) return NULL; if (virSecretDefineXMLEnsureACL(conn, def) < 0) diff --git a/tests/secretxml2xmltest.c b/tests/secretxml2xmltest.c index 828e44a32b..eb4d3e143c 100644 --- a/tests/secretxml2xmltest.c +++ b/tests/secretxml2xmltest.c @@ -13,7 +13,7 @@ testCompareXMLToXMLFiles(const char *inxml, const char *o= utxml) g_autofree char *actual =3D NULL; g_autoptr(virSecretDef) secret =3D NULL; - if (!(secret =3D virSecretDefParseFile(inxml))) + if (!(secret =3D virSecretDefParse(NULL, inxml, 0))) return -1; if (!(actual =3D virSecretDefFormat(secret))) --=20 2.37.3