From nobody Mon Feb 9 01:45:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1607961401; cv=none; d=zohomail.com; s=zohoarc; b=La9xw75tenbVg+aMcw7iFZ6HqcSrfFTXTb2XtS1/oIgU57kory6ToMLkWOGmzZ2FZvLh4sKQtHlRX+uBBmTBeIgrJd7Ib3kGcqoswQTx81hKMb5VJ/kIiM1Eck1vmsvoTpKaxiA0irbYFeh0PAmn8dz992FljIFCrfoMPE7weQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607961401; 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=8EwrFIm5amzIJxBGJ3w/QID3G52qkFPSIVczI6/zuFE=; b=a0I+iMlZQGlHNNenweWht2viUfC3CM/U+Brbs57HEdslmoCHkj0Rfz9cOnhx91MfV4+bbdWTOWRx7I3YAQarbSz4qTMyRLJYC3Rjm+/TKskdmy1NhWBpQ9piESIrYbYAnolL2hPYUul/a+upeDNY3lIMszHoMh8xwTQ0y/pfexw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1607961400782538.8318600913948; Mon, 14 Dec 2020 07:56:40 -0800 (PST) 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-250-f1yW1dgUPlmCdHCAKn-d0g-1; Mon, 14 Dec 2020 10:56:34 -0500 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 D123C801AAA; Mon, 14 Dec 2020 15:56:28 +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 AE1D018F0A; Mon, 14 Dec 2020 15:56:28 +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 781B81809CAC; Mon, 14 Dec 2020 15:56:28 +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 0BEFu2Bw028696 for ; Mon, 14 Dec 2020 10:56:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 80C0A5D6D5; Mon, 14 Dec 2020 15:56:02 +0000 (UTC) Received: from antique-work.lan (unknown [10.40.194.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id F09A762686 for ; Mon, 14 Dec 2020 15:55:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607961396; 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=8EwrFIm5amzIJxBGJ3w/QID3G52qkFPSIVczI6/zuFE=; b=aZBOJbK+/2iYaxW+bJaDP+YhwkHTneUCnLLdJkjU+1GUhxM1tsP+mMVdDv89FYWknfGVNr 6zjbDLL9HC9fWWDdQpBOdi0u9Id7BtEKo5q1/xzGmWeyQg4/cKWqTonKpvdI1B5/8SXDLm P08lLu5PHFVcuqcSTvkgIofEN8jA1QA= X-MC-Unique: f1yW1dgUPlmCdHCAKn-d0g-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 17/17] storage_file: use virStorageFile prefix for all functions Date: Mon, 14 Dec 2020 16:55:37 +0100 Message-Id: <4f4fcdde7fbced35bb908476ef8cc77b3f2c8adf.1607960951.git.phrdina@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 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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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" Now that storage file code is separated from storage source definition it makes sense to rename the functions to make it clear. Signed-off-by: Pavel Hrdina --- src/libvirt_private.syms | 18 +++++----- src/libxl/xen_xl.c | 2 +- src/qemu/qemu_domain.c | 16 ++++----- src/qemu/qemu_driver.c | 6 ++-- src/storage/storage_util.c | 6 ++-- src/storage_file/storage_file.c | 60 ++++++++++++++++----------------- src/storage_file/storage_file.h | 42 +++++++++++------------ tests/qemublocktest.c | 6 ++-- tests/virstoragetest.c | 2 +- 9 files changed, 79 insertions(+), 79 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 91f795adfc..c1a5aab7d6 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1681,6 +1681,7 @@ virStorageFileChainLookup; virStorageFileChown; virStorageFileCreate; virStorageFileDeinit; +virStorageFileFindByNodeName; virStorageFileGetBackingStoreStr; virStorageFileGetMetadata; virStorageFileGetMetadataFromBuf; @@ -1689,8 +1690,13 @@ virStorageFileGetRelativeBackingPath; virStorageFileGetUniqueIdentifier; virStorageFileInit; virStorageFileInitAs; +virStorageFileNewFromBacking; +virStorageFileNewFromBackingAbsolute; virStorageFileParseBackingStoreStr; virStorageFileParseChainIndex; +virStorageFileParseRBDColonString; +virStorageFilePrivateDataFormatRelPath; +virStorageFilePrivateDataParseRelPath; virStorageFileProbeFormat; virStorageFileRead; virStorageFileReportBrokenChain; @@ -1700,15 +1706,9 @@ virStorageFileSupportsBackingChainTraversal; virStorageFileSupportsCreate; virStorageFileSupportsSecurityDriver; virStorageFileUnlink; -virStorageSourceFindByNodeName; -virStorageSourceNewFromBacking; -virStorageSourceNewFromBackingAbsolute; -virStorageSourceParseRBDColonString; -virStorageSourcePrivateDataFormatRelPath; -virStorageSourcePrivateDataParseRelPath; -virStorageSourceUpdateBackingSizes; -virStorageSourceUpdateCapacity; -virStorageSourceUpdatePhysicalSize; +virStorageFileUpdateBackingSizes; +virStorageFileUpdateCapacity; +virStorageFileUpdatePhysicalSize; =20 =20 # storage_file/storage_file_backend.h diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c index 1f97e6bdd4..f26f9bb5b7 100644 --- a/src/libxl/xen_xl.c +++ b/src/libxl/xen_xl.c @@ -640,7 +640,7 @@ xenParseXLDiskSrc(virDomainDiskDefPtr disk, char *srcst= r) =20 virDomainDiskSetType(disk, VIR_STORAGE_TYPE_NETWORK); disk->src->protocol =3D VIR_STORAGE_NET_PROTOCOL_RBD; - ret =3D virStorageSourceParseRBDColonString(tmpstr, disk->src); + ret =3D virStorageFileParseRBDColonString(tmpstr, disk->src); } else { virDomainDiskSetSource(disk, srcstr); =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8ddb7b70d2..f193c5e417 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1894,7 +1894,7 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr = ctxt, return -1; } =20 - if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0) + if (virStorageFilePrivateDataParseRelPath(ctxt, src) < 0) return -1; =20 return 0; @@ -1936,7 +1936,7 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePt= r src, if (src->pr) virBufferAsprintf(buf, "\n", src->p= r->mgralias); =20 - if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0) + if (virStorageFilePrivateDataFormatRelPath(src, buf) < 0) return -1; =20 if (srcPriv) { @@ -2597,15 +2597,15 @@ qemuDomainObjPrivateXMLParseBlockjobNodename(qemuBl= ockJobDataPtr job, return; =20 if (job->disk && - (*src =3D virStorageSourceFindByNodeName(job->disk->src, nodename)= )) + (*src =3D virStorageFileFindByNodeName(job->disk->src, nodename))) return; =20 if (job->chain && - (*src =3D virStorageSourceFindByNodeName(job->chain, nodename))) + (*src =3D virStorageFileFindByNodeName(job->chain, nodename))) return; =20 if (job->mirrorChain && - (*src =3D virStorageSourceFindByNodeName(job->mirrorChain, nodenam= e))) + (*src =3D virStorageFileFindByNodeName(job->mirrorChain, nodename)= )) return; =20 /* the node was in the XML but was not found in the job definitions */ @@ -9920,11 +9920,11 @@ qemuDomainDiskLookupByNodename(virDomainDefPtr def, for (i =3D 0; i < def->ndisks; i++) { virDomainDiskDefPtr domdisk =3D def->disks[i]; =20 - if ((*src =3D virStorageSourceFindByNodeName(domdisk->src, nodenam= e))) + if ((*src =3D virStorageFileFindByNodeName(domdisk->src, nodename)= )) return domdisk; =20 if (domdisk->mirror && - (*src =3D virStorageSourceFindByNodeName(domdisk->mirror, node= name))) + (*src =3D virStorageFileFindByNodeName(domdisk->mirror, nodena= me))) return domdisk; } =20 @@ -9933,7 +9933,7 @@ qemuDomainDiskLookupByNodename(virDomainDefPtr def, virDomainBackupDiskDefPtr backupdisk =3D backupdef->disks + i; =20 if (backupdisk->store && - (*src =3D virStorageSourceFindByNodeName(backupdisk->store= , nodename))) + (*src =3D virStorageFileFindByNodeName(backupdisk->store, = nodename))) return virDomainDiskByTarget(def, backupdisk->name); } } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f6554e1506..0818bb9f89 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10838,7 +10838,7 @@ qemuDomainStorageUpdatePhysical(virQEMUDriverPtr dr= iver, return -1; } =20 - ret =3D virStorageSourceUpdatePhysicalSize(src, fd, &sb); + ret =3D virStorageFileUpdatePhysicalSize(src, fd, &sb); =20 qemuDomainStorageCloseStat(src, &fd); =20 @@ -10906,10 +10906,10 @@ qemuStorageLimitsRefresh(virQEMUDriverPtr driver, goto cleanup; } =20 - if (virStorageSourceUpdateBackingSizes(src, fd, &sb) < 0) + if (virStorageFileUpdateBackingSizes(src, fd, &sb) < 0) goto cleanup; =20 - if (virStorageSourceUpdateCapacity(src, buf, len) < 0) + if (virStorageFileUpdateCapacity(src, buf, len) < 0) goto cleanup; =20 /* If guest is not using raw disk format and is on a host block diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 7616ec63a0..9274e91c47 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -1842,7 +1842,7 @@ storageBackendUpdateVolTargetInfo(virStorageVolType v= oltype, } } =20 - if (virStorageSourceUpdateCapacity(target, buf, len) < 0) + if (virStorageFileUpdateCapacity(target, buf, len) < 0) return -1; } =20 @@ -1906,7 +1906,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSour= cePtr target, char *filecon =3D NULL; #endif =20 - if (virStorageSourceUpdateBackingSizes(target, fd, sb) < 0) + if (virStorageFileUpdateBackingSizes(target, fd, sb) < 0) return -1; =20 if (!target->perms) @@ -3449,7 +3449,7 @@ storageBackendProbeTarget(virStorageSourcePtr target, return -1; =20 if (meta->backingStoreRaw) { - virStorageSourceNewFromBacking(meta, &target->backingStore); + virStorageFileNewFromBacking(meta, &target->backingStore); =20 /* XXX: Remote storage doesn't play nicely with volumes backed by * remote storage. To avoid trouble, just fake the backing store i= s RAW diff --git a/src/storage_file/storage_file.c b/src/storage_file/storage_fil= e.c index e5b2f68420..7de3daec33 100644 --- a/src/storage_file/storage_file.c +++ b/src/storage_file/storage_file.c @@ -1292,8 +1292,8 @@ virStorageFileChainLookup(virStorageSourcePtr chain, =20 =20 static virStorageSourcePtr -virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent, - const char *rel) +virStorageFileNewFromBackingRelative(virStorageSourcePtr parent, + const char *rel) { g_autofree char *dirname =3D NULL; g_autoptr(virStorageSource) def =3D virStorageSourceNew(); @@ -1480,8 +1480,8 @@ virStorageSourceRBDAddHost(virStorageSourcePtr src, =20 =20 int -virStorageSourceParseRBDColonString(const char *rbdstr, - virStorageSourcePtr src) +virStorageFileParseRBDColonString(const char *rbdstr, + virStorageSourcePtr src) { char *p, *e, *next; g_autofree char *options =3D NULL; @@ -1691,7 +1691,7 @@ virStorageSourceParseBackingColon(virStorageSourcePtr= src, break; =20 case VIR_STORAGE_NET_PROTOCOL_RBD: - if (virStorageSourceParseRBDColonString(path, src) < 0) + if (virStorageFileParseRBDColonString(path, src) < 0) return -1; break; =20 @@ -2253,7 +2253,7 @@ virStorageSourceParseBackingJSONRBD(virStorageSourceP= tr src, =20 /* legacy syntax passed via 'filename' option */ if ((filename =3D virJSONValueObjectGetString(json, "filename"))) - return virStorageSourceParseRBDColonString(filename, src); + return virStorageFileParseRBDColonString(filename, src); =20 if (!pool || !image) { virReportError(VIR_ERR_INVALID_ARG, "%s", @@ -2487,7 +2487,7 @@ virStorageSourceParseBackingJSON(virStorageSourcePtr = src, =20 =20 /** - * virStorageSourceNewFromBackingAbsolute + * virStorageFileNewFromBackingAbsolute * @path: string representing absolute location of a storage source * @src: filled with virStorageSource object representing @path * @@ -2497,8 +2497,8 @@ virStorageSourceParseBackingJSON(virStorageSourcePtr = src, * error is reported. */ int -virStorageSourceNewFromBackingAbsolute(const char *path, - virStorageSourcePtr *src) +virStorageFileNewFromBackingAbsolute(const char *path, + virStorageSourcePtr *src) { const char *json; const char *dirpath; @@ -2580,10 +2580,10 @@ virStorageSourceNewFromChild(virStorageSourcePtr pa= rent, *child =3D NULL; =20 if (virFileIsRelative(parentRaw)) { - if (!(def =3D virStorageSourceNewFromBackingRelative(parent, paren= tRaw))) + if (!(def =3D virStorageFileNewFromBackingRelative(parent, parentR= aw))) return -1; } else { - if ((rc =3D virStorageSourceNewFromBackingAbsolute(parentRaw, &def= )) < 0) + if ((rc =3D virStorageFileNewFromBackingAbsolute(parentRaw, &def))= < 0) return -1; } =20 @@ -2611,8 +2611,8 @@ virStorageSourceNewFromChild(virStorageSourcePtr pare= nt, =20 =20 int -virStorageSourceNewFromBacking(virStorageSourcePtr parent, - virStorageSourcePtr *backing) +virStorageFileNewFromBacking(virStorageSourcePtr parent, + virStorageSourcePtr *backing) { int rc; =20 @@ -2639,9 +2639,9 @@ virStorageSourceNewFromBacking(virStorageSourcePtr pa= rent, * Returns 0 on success, -1 on error. No libvirt errors are reported. */ int -virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src, - int fd, - struct stat const *sb) +virStorageFileUpdatePhysicalSize(virStorageSourcePtr src, + int fd, + struct stat const *sb) { off_t end; virStorageType actual_type =3D virStorageSourceGetActualType(src); @@ -2687,9 +2687,9 @@ virStorageSourceUpdatePhysicalSize(virStorageSourcePt= r src, * Returns 0 on success, -1 on error. */ int -virStorageSourceUpdateBackingSizes(virStorageSourcePtr src, - int fd, - struct stat const *sb) +virStorageFileUpdateBackingSizes(virStorageSourcePtr src, + int fd, + struct stat const *sb) { /* Get info for normal formats */ if (S_ISREG(sb->st_mode) || fd =3D=3D -1) { @@ -2750,9 +2750,9 @@ virStorageSourceUpdateBackingSizes(virStorageSourcePt= r src, * Returns 0 on success, -1 on error. */ int -virStorageSourceUpdateCapacity(virStorageSourcePtr src, - char *buf, - ssize_t len) +virStorageFileUpdateCapacity(virStorageSourcePtr src, + char *buf, + ssize_t len) { int format =3D src->format; g_autoptr(virStorageSource) meta =3D NULL; @@ -3066,7 +3066,7 @@ virStorageFileGetRelativeBackingPath(virStorageSource= Ptr top, =20 =20 /** - * virStorageSourceFindByNodeName: + * virStorageFileFindByNodeName: * @top: backing chain top * @nodeName: node name to find in backing chain * @@ -3075,8 +3075,8 @@ virStorageFileGetRelativeBackingPath(virStorageSource= Ptr top, * On failure NULL is returned and no error is reported. */ virStorageSourcePtr -virStorageSourceFindByNodeName(virStorageSourcePtr top, - const char *nodeName) +virStorageFileFindByNodeName(virStorageSourcePtr top, + const char *nodeName) { virStorageSourcePtr tmp; =20 @@ -3091,8 +3091,8 @@ virStorageSourceFindByNodeName(virStorageSourcePtr to= p, =20 =20 int -virStorageSourcePrivateDataParseRelPath(xmlXPathContextPtr ctxt, - virStorageSourcePtr src) +virStorageFilePrivateDataParseRelPath(xmlXPathContextPtr ctxt, + virStorageSourcePtr src) { src->relPath =3D virXPathString("string(./relPath)", ctxt); return 0; @@ -3100,8 +3100,8 @@ virStorageSourcePrivateDataParseRelPath(xmlXPathConte= xtPtr ctxt, =20 =20 int -virStorageSourcePrivateDataFormatRelPath(virStorageSourcePtr src, - virBufferPtr buf) +virStorageFilePrivateDataFormatRelPath(virStorageSourcePtr src, + virBufferPtr buf) { if (src->relPath) virBufferEscapeString(buf, "%s\n", src->relPath= ); @@ -3708,7 +3708,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr = src, } =20 if (src->backingStoreRaw) { - if ((rv =3D virStorageSourceNewFromBacking(src, &backingStore)) < = 0) + if ((rv =3D virStorageFileNewFromBacking(src, &backingStore)) < 0) return -1; =20 /* the backing file would not be usable for VM usage */ diff --git a/src/storage_file/storage_file.h b/src/storage_file/storage_fil= e.h index 181efded87..67eb20a866 100644 --- a/src/storage_file/storage_file.h +++ b/src/storage_file/storage_file.h @@ -74,26 +74,26 @@ virStorageFileChainLookup(virStorageSourcePtr chain, ATTRIBUTE_NONNULL(1); =20 int -virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src, - int fd, - struct stat const *sb); +virStorageFileUpdatePhysicalSize(virStorageSourcePtr src, + int fd, + struct stat const *sb); int -virStorageSourceUpdateBackingSizes(virStorageSourcePtr src, - int fd, - struct stat const *sb); +virStorageFileUpdateBackingSizes(virStorageSourcePtr src, + int fd, + struct stat const *sb); =20 int -virStorageSourceUpdateCapacity(virStorageSourcePtr src, - char *buf, - ssize_t len); +virStorageFileUpdateCapacity(virStorageSourcePtr src, + char *buf, + ssize_t len); =20 int -virStorageSourceNewFromBacking(virStorageSourcePtr parent, - virStorageSourcePtr *backing); +virStorageFileNewFromBacking(virStorageSourcePtr parent, + virStorageSourcePtr *backing); =20 int -virStorageSourceParseRBDColonString(const char *rbdstr, - virStorageSourcePtr src) +virStorageFileParseRBDColonString(const char *rbdstr, + virStorageSourcePtr src) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 typedef int @@ -113,21 +113,21 @@ virStorageFileGetRelativeBackingPath(virStorageSource= Ptr from, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); =20 int -virStorageSourceNewFromBackingAbsolute(const char *path, - virStorageSourcePtr *src); +virStorageFileNewFromBackingAbsolute(const char *path, + virStorageSourcePtr *src); =20 virStorageSourcePtr -virStorageSourceFindByNodeName(virStorageSourcePtr top, - const char *nodeName) +virStorageFileFindByNodeName(virStorageSourcePtr top, + const char *nodeName) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 int -virStorageSourcePrivateDataParseRelPath(xmlXPathContextPtr ctxt, - virStorageSourcePtr src); +virStorageFilePrivateDataParseRelPath(xmlXPathContextPtr ctxt, + virStorageSourcePtr src); =20 int -virStorageSourcePrivateDataFormatRelPath(virStorageSourcePtr src, - virBufferPtr buf); +virStorageFilePrivateDataFormatRelPath(virStorageSourcePtr src, + virBufferPtr buf); =20 int virStorageFileInit(virStorageSourcePtr src); diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c index ee57449868..b31746fa17 100644 --- a/tests/qemublocktest.c +++ b/tests/qemublocktest.c @@ -106,8 +106,8 @@ testBackingXMLjsonXML(const void *args) =20 protocolwrapper =3D g_strdup_printf("json:%s", propsstr); =20 - if (virStorageSourceNewFromBackingAbsolute(protocolwrapper, - &jsonsrc) < 0) { + if (virStorageFileNewFromBackingAbsolute(protocolwrapper, + &jsonsrc) < 0) { fprintf(stderr, "failed to parse disk json\n"); return -1; } @@ -155,7 +155,7 @@ testJSONtoJSON(const void *args) if (virTestLoadFile(infile, &in) < 0) return -1; =20 - if (virStorageSourceNewFromBackingAbsolute(in, &src) < 0) { + if (virStorageFileNewFromBackingAbsolute(in, &src) < 0) { fprintf(stderr, "failed to parse disk json\n"); return -1; } diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 59c03255d4..0882c6c86d 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -592,7 +592,7 @@ testBackingParse(const void *args) if (!data->expect) erc =3D -1; =20 - if ((rc =3D virStorageSourceNewFromBackingAbsolute(data->backing, &src= )) !=3D erc) { + if ((rc =3D virStorageFileNewFromBackingAbsolute(data->backing, &src))= !=3D erc) { fprintf(stderr, "expected return value '%d' actual '%d'\n", erc, r= c); return -1; } --=20 2.28.0