From nobody Mon Feb 9 03:47:48 2026 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 15532777197272.4528286293402743; Fri, 22 Mar 2019 11:01:59 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0A8AA9639; Fri, 22 Mar 2019 18:01:57 +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 BE31A1001E8D; Fri, 22 Mar 2019 18:01:57 +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 6AA2C3D38F; Fri, 22 Mar 2019 18:01:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2MI1Od1008930 for ; Fri, 22 Mar 2019 14:01:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 688D75D9D6; Fri, 22 Mar 2019 18:01:24 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id E59EB5D9D2 for ; Fri, 22 Mar 2019 18:01:23 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 22 Mar 2019 19:00:52 +0100 Message-Id: <960b365f41906b8a547dc43f1772a1f378404bc3.1553277561.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 16/29] conf: introduce virDomainStorageSourceParseBase 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 22 Mar 2019 18:01:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The helper converts the 'type', 'format' and index values to enum values/numbers and does validation. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 39 +++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 5 +++++ src/libvirt_private.syms | 1 + 3 files changed, 45 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c93c4df929..9b64e33ff5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9039,6 +9039,45 @@ virDomainDiskSourcePRParse(xmlNodePtr node, } +virStorageSourcePtr +virDomainStorageSourceParseBase(const char *type, + const char *format, + const char *index) +{ + VIR_AUTOUNREF(virStorageSourcePtr) src =3D NULL; + virStorageSourcePtr ret =3D NULL; + + if (!(src =3D virStorageSourceNew())) + return NULL; + + src->type =3D VIR_STORAGE_TYPE_FILE; + + if (type && + (src->type =3D virStorageTypeFromString(type)) <=3D 0) { + virReportError(VIR_ERR_XML_ERROR, + _("unknown storage source type '%s'"), type); + return NULL; + } + + if (format && + (src->format =3D virStorageFileFormatTypeFromString(format)) <=3D = 0) { + virReportError(VIR_ERR_XML_ERROR, + _("unknown storage source format '%s'"), format); + return NULL; + } + + if (index && + virStrToLong_uip(index, NULL, 10, &src->id) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid storage source index '%s'"), index); + return NULL; + } + + VIR_STEAL_PTR(ret, src); + return ret; +} + + int virDomainStorageSourceParse(xmlNodePtr node, xmlXPathContextPtr ctxt, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f550c257d6..ce6e5b4748 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3452,6 +3452,11 @@ int virDomainDiskDefCheckDuplicateInfo(const virDoma= inDiskDef *a, const virDomainDiskDef *b) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +virStorageSourcePtr +virDomainStorageSourceParseBase(const char *type, + const char *format, + const char *index) + ATTRIBUTE_RETURN_CHECK; int virDomainStorageSourceParse(xmlNodePtr node, xmlXPathContextPtr ctxt, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 681ff911b6..6246b4c034 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -565,6 +565,7 @@ virDomainStateTypeFromString; virDomainStateTypeToString; virDomainStorageNetworkParseHost; virDomainStorageSourceParse; +virDomainStorageSourceParseBase; virDomainTaintTypeFromString; virDomainTaintTypeToString; virDomainTimerModeTypeFromString; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list