From nobody Wed May 14 21:45:49 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1516973765937239.30616525185428; Fri, 26 Jan 2018 05:36:05 -0800 (PST) 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 mx1.redhat.com (Postfix) with ESMTPS id DFD3810DA7D; Fri, 26 Jan 2018 13:36:03 +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 B5B1079162; Fri, 26 Jan 2018 13:36:03 +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 74C223FB1F; Fri, 26 Jan 2018 13:36:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w0QDZsr9025246 for ; Fri, 26 Jan 2018 08:35:54 -0500 Received: by smtp.corp.redhat.com (Postfix) id D264A75A0E; Fri, 26 Jan 2018 13:35:54 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC30175A0A; Fri, 26 Jan 2018 13:35:53 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 26 Jan 2018 13:35:37 +0000 Message-Id: <20180126133537.31883-11-berrange@redhat.com> In-Reply-To: <20180126133537.31883-1-berrange@redhat.com> References: <20180126133537.31883-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 10/10] storage: remove virConnectPtr from all backend functions 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 26 Jan 2018 13:36:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Now that we can open connections to the secondary drivers on demand, there is no need to pass a virConnectPtr into all the backend functions. Signed-off-by: Daniel P. Berrang=C3=A9 --- src/storage/storage_backend.h | 45 ++++++----------- src/storage/storage_backend_disk.c | 30 +++++------- src/storage/storage_backend_fs.c | 15 ++---- src/storage/storage_backend_gluster.c | 9 ++-- src/storage/storage_backend_iscsi.c | 12 ++--- src/storage/storage_backend_logical.c | 36 +++++--------- src/storage/storage_backend_mpath.c | 5 +- src/storage/storage_backend_rbd.c | 24 +++------ src/storage/storage_backend_scsi.c | 46 ++++++++++-------- src/storage/storage_backend_sheepdog.c | 33 +++++-------- src/storage/storage_backend_vstorage.c | 10 ++-- src/storage/storage_backend_zfs.c | 15 ++---- src/storage/storage_driver.c | 89 +++++++++++++++---------------= ---- src/storage/storage_util.c | 59 ++++++++-------------- src/storage/storage_util.h | 33 +++++-------- tests/storagevolxml2argvtest.c | 7 +-- 16 files changed, 179 insertions(+), 289 deletions(-) diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 193cf134d6..8dbe344149 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -25,22 +25,16 @@ # include "virstorageobj.h" # include "storage_driver.h" =20 -typedef char * (*virStorageBackendFindPoolSources)(virConnectPtr conn, - const char *srcSpec, +typedef char * (*virStorageBackendFindPoolSources)(const char *srcSpec, unsigned int flags); typedef int (*virStorageBackendCheckPool)(virStoragePoolObjPtr pool, bool *active); -typedef int (*virStorageBackendStartPool)(virConnectPtr conn, - virStoragePoolObjPtr pool); -typedef int (*virStorageBackendBuildPool)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendStartPool)(virStoragePoolObjPtr pool); +typedef int (*virStorageBackendBuildPool)(virStoragePoolObjPtr pool, unsigned int flags); -typedef int (*virStorageBackendRefreshPool)(virConnectPtr conn, - virStoragePoolObjPtr pool); -typedef int (*virStorageBackendStopPool)(virConnectPtr conn, - virStoragePoolObjPtr pool); -typedef int (*virStorageBackendDeletePool)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendRefreshPool)(virStoragePoolObjPtr pool); +typedef int (*virStorageBackendStopPool)(virStoragePoolObjPtr pool); +typedef int (*virStorageBackendDeletePool)(virStoragePoolObjPtr pool, unsigned int flags); =20 /* A 'buildVol' backend must remove any volume created on error since @@ -52,46 +46,37 @@ typedef int (*virStorageBackendDeletePool)(virConnectPt= r conn, * was not aware of between checking the pool and the create attempt. It * also avoids extra round trips to just delete a file. */ -typedef int (*virStorageBackendBuildVol)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendBuildVol)(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags); -typedef int (*virStorageBackendCreateVol)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendCreateVol)(virStoragePoolObjPtr pool, virStorageVolDefPtr vol); -typedef int (*virStorageBackendRefreshVol)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendRefreshVol)(virStoragePoolObjPtr pool, virStorageVolDefPtr vol); -typedef int (*virStorageBackendDeleteVol)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendDeleteVol)(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags); -typedef int (*virStorageBackendBuildVolFrom)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendBuildVolFrom)(virStoragePoolObjPtr pool, virStorageVolDefPtr origvol, virStorageVolDefPtr newvol, unsigned int flags); -typedef int (*virStorageBackendVolumeResize)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendVolumeResize)(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned long long capacity, unsigned int flags); -typedef int (*virStorageBackendVolumeDownload)(virConnectPtr conn, - virStoragePoolObjPtr obj, +typedef int (*virStorageBackendVolumeDownload)(virStoragePoolObjPtr obj, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, unsigned long long length, unsigned int flags); -typedef int (*virStorageBackendVolumeUpload)(virConnectPtr conn, - virStoragePoolObjPtr obj, +typedef int (*virStorageBackendVolumeUpload)(virStoragePoolObjPtr obj, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, unsigned long long len, unsigned int flags); -typedef int (*virStorageBackendVolumeWipe)(virConnectPtr conn, - virStoragePoolObjPtr pool, +typedef int (*virStorageBackendVolumeWipe)(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags); diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backe= nd_disk.c index f862a896b0..7b4549c34d 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -439,8 +439,7 @@ virStorageBackendDiskReadGeometry(virStoragePoolObjPtr = pool) } =20 static int -virStorageBackendDiskRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendDiskRefreshPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); =20 @@ -464,8 +463,7 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn ATT= RIBUTE_UNUSED, =20 =20 static int -virStorageBackendDiskStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendDiskStartPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); const char *format; @@ -493,8 +491,7 @@ virStorageBackendDiskStartPool(virConnectPtr conn ATTRI= BUTE_UNUSED, * Write a new partition table header */ static int -virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendDiskBuildPool(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -751,7 +748,6 @@ virStorageBackendDiskPartBoundaries(virStoragePoolObjPt= r pool, =20 =20 /* virStorageBackendDiskDeleteVol - * @conn: Pointer to a libvirt connection * @pool: Pointer to the storage pool * @vol: Pointer to the volume definition * @flags: flags (unused for now) @@ -776,8 +772,7 @@ virStorageBackendDiskPartBoundaries(virStoragePoolObjPt= r pool, * Returns 0 on success, -1 on failure with error message set. */ static int -virStorageBackendDiskDeleteVol(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendDiskDeleteVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { @@ -856,7 +851,7 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn, * here is pointless */ virStoragePoolObjClearVols(pool); - if (virStorageBackendDiskRefreshPool(conn, pool) < 0) + if (virStorageBackendDiskRefreshPool(pool) < 0) goto cleanup; =20 rc =3D 0; @@ -868,8 +863,7 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn, =20 =20 static int -virStorageBackendDiskCreateVol(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendDiskCreateVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { int res =3D -1; @@ -921,7 +915,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn, * since we could be calling this with vol->target.path =3D=3D NULL */ virErrorPtr save_err =3D virSaveLastError(); - ignore_value(virStorageBackendDiskDeleteVol(conn, pool, vol, 0)); + ignore_value(virStorageBackendDiskDeleteVol(pool, vol, 0)); virSetError(save_err); virFreeError(save_err); goto cleanup; @@ -936,8 +930,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn, } =20 static int -virStorageBackendDiskBuildVolFrom(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendDiskBuildVolFrom(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -948,19 +941,18 @@ virStorageBackendDiskBuildVolFrom(virConnectPtr conn, if (!build_func) return -1; =20 - return build_func(conn, pool, vol, inputvol, flags); + return build_func(pool, vol, inputvol, flags); } =20 =20 static int -virStorageBackendDiskVolWipe(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendDiskVolWipe(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags) { if (vol->source.partType !=3D VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) - return virStorageBackendVolWipeLocal(conn, pool, vol, algorithm, f= lags); + return virStorageBackendVolWipeLocal(pool, vol, algorithm, flags); =20 /* Wiping an extended partition is not support */ virReportError(VIR_ERR_NO_SUPPORT, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend= _fs.c index f54759983c..b3bae38437 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -145,8 +145,7 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNet= fsDiscoverState *state) =20 =20 static char * -virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE= _UNUSED, - const char *srcSpec, +virStorageBackendFileSystemNetFindPoolSources(const char *srcSpec, unsigned int flags) { virNetfsDiscoverState state =3D { @@ -427,7 +426,6 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr p= ool) =20 =20 /** - * @conn connection to report errors against * @pool storage pool to start * * Starts a directory or FS based storage pool. The underlying source @@ -436,8 +434,7 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr p= ool) * Returns 0 on success, -1 on error */ static int -virStorageBackendFileSystemStart(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendFileSystemStart(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); =20 @@ -450,7 +447,6 @@ virStorageBackendFileSystemStart(virConnectPtr conn ATT= RIBUTE_UNUSED, =20 =20 /** - * @conn connection to report errors against * @pool storage pool to unmount * * Stops a file storage pool. The underlying source device is unmounted @@ -462,8 +458,7 @@ virStorageBackendFileSystemStart(virConnectPtr conn ATT= RIBUTE_UNUSED, * Returns 0 if successfully unmounted, -1 on error */ static int -virStorageBackendFileSystemStop(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendFileSystemStop(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); virCommandPtr cmd =3D NULL; @@ -609,7 +604,6 @@ virStorageBackendMakeFileSystem(virStoragePoolObjPtr po= ol, =20 =20 /** - * @conn connection to report errors against * @pool storage pool to build * @flags controls the pool formatting behaviour * @@ -630,8 +624,7 @@ virStorageBackendMakeFileSystem(virStoragePoolObjPtr po= ol, * Returns 0 on success, -1 on error */ static int -virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool, unsigned int flags) { virCheckFlags(VIR_STORAGE_POOL_BUILD_OVERWRITE | diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_ba= ckend_gluster.c index 5eea84f16e..6e4f19f76d 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -342,8 +342,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlu= sterStatePtr state, } =20 static int -virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendGlusterRefreshPool(virStoragePoolObjPtr pool) { int ret =3D -1; virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -423,8 +422,7 @@ virStorageBackendGlusterRefreshPool(virConnectPtr conn = ATTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendGlusterVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendGlusterVolDelete(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { @@ -485,8 +483,7 @@ virStorageBackendGlusterVolDelete(virConnectPtr conn AT= TRIBUTE_UNUSED, =20 =20 static char * -virStorageBackendGlusterFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE= D, - const char *srcSpec, +virStorageBackendGlusterFindPoolSources(const char *srcSpec, unsigned int flags) { virStoragePoolSourceList list =3D { .type =3D VIR_STORAGE_POOL_GLUSTER, diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_back= end_iscsi.c index 921215c9e9..11addec9a8 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -158,8 +158,7 @@ virStorageBackendISCSIFindLUs(virStoragePoolObjPtr pool, =20 =20 static char * -virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *srcSpec, +virStorageBackendISCSIFindPoolSources(const char *srcSpec, unsigned int flags) { virStoragePoolSourcePtr source =3D NULL; @@ -324,8 +323,7 @@ virStorageBackendISCSISetAuth(const char *portal, } =20 static int -virStorageBackendISCSIStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendISCSIStartPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); char *portal =3D NULL; @@ -377,8 +375,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn ATTR= IBUTE_UNUSED, } =20 static int -virStorageBackendISCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendISCSIRefreshPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); char *session =3D NULL; @@ -402,8 +399,7 @@ virStorageBackendISCSIRefreshPool(virConnectPtr conn AT= TRIBUTE_UNUSED, =20 =20 static int -virStorageBackendISCSIStopPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendISCSIStopPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); char *portal; diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index 64bfc8c976..6a7d59bd57 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -588,8 +588,7 @@ virStorageBackendLogicalGetPoolSources(virStoragePoolSo= urceListPtr sourceList) =20 =20 static char * -virStorageBackendLogicalFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE= D, - const char *srcSpec ATTRIBUTE_UNUS= ED, +virStorageBackendLogicalFindPoolSources(const char *srcSpec ATTRIBUTE_UNUS= ED, unsigned int flags) { virStoragePoolSourceList sourceList; @@ -728,8 +727,7 @@ virStorageBackendLogicalCheckPool(virStoragePoolObjPtr = pool, } =20 static int -virStorageBackendLogicalStartPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendLogicalStartPool(virStoragePoolObjPtr pool) { /* Let's make sure that the pool's name matches the pvs output and * that the pool's source devices match the pvs output. @@ -743,8 +741,7 @@ virStorageBackendLogicalStartPool(virConnectPtr conn AT= TRIBUTE_UNUSED, =20 =20 static int -virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendLogicalBuildPool(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -799,8 +796,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn AT= TRIBUTE_UNUSED, =20 =20 static int -virStorageBackendLogicalRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendLogicalRefreshPool(virStoragePoolObjPtr pool) { /* * # vgs --separator : --noheadings --units b --unbuffered --nosuffix= --options "vg_size,vg_free" VGNAME @@ -862,8 +858,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn = ATTRIBUTE_UNUSED, * "Can't deactivate volume group "VolGroup00" with 3 open logical volume(= s)" */ static int -virStorageBackendLogicalStopPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendLogicalStopPool(virStoragePoolObjPtr pool) { if (virStorageBackendLogicalSetActive(pool, 0) < 0) return -1; @@ -872,8 +867,7 @@ virStorageBackendLogicalStopPool(virConnectPtr conn ATT= RIBUTE_UNUSED, } =20 static int -virStorageBackendLogicalDeletePool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendLogicalDeletePool(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -903,8 +897,7 @@ virStorageBackendLogicalDeletePool(virConnectPtr conn A= TTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUS= ED, +virStorageBackendLogicalDeleteVol(virStoragePoolObjPtr pool ATTRIBUTE_UNUS= ED, virStorageVolDefPtr vol, unsigned int flags) { @@ -977,8 +970,7 @@ virStorageBackendLogicalLVCreate(virStorageVolDefPtr vo= l, =20 =20 static int -virStorageBackendLogicalCreateVol(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendLogicalCreateVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { int fd =3D -1; @@ -1042,15 +1034,14 @@ virStorageBackendLogicalCreateVol(virConnectPtr con= n, error: err =3D virSaveLastError(); VIR_FORCE_CLOSE(fd); - virStorageBackendLogicalDeleteVol(conn, pool, vol, 0); + virStorageBackendLogicalDeleteVol(pool, vol, 0); virSetError(err); virFreeError(err); return -1; } =20 static int -virStorageBackendLogicalBuildVolFrom(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendLogicalBuildVolFrom(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -1061,18 +1052,17 @@ virStorageBackendLogicalBuildVolFrom(virConnectPtr = conn, if (!build_func) return -1; =20 - return build_func(conn, pool, vol, inputvol, flags); + return build_func(pool, vol, inputvol, flags); } =20 static int -virStorageBackendLogicalVolWipe(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendLogicalVolWipe(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags) { if (!vol->target.sparse) - return virStorageBackendVolWipeLocal(conn, pool, vol, algorithm, f= lags); + return virStorageBackendVolWipeLocal(pool, vol, algorithm, flags); =20 /* The wiping algorithms will write something to the logical volume. * Writing to a sparse logical volume causes it to be filled resulting diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_back= end_mpath.c index 4bc39c24eb..5dcc40f601 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -256,13 +256,12 @@ virStorageBackendMpathCheckPool(virStoragePoolObjPtr = pool ATTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendMpathRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendMpathRefreshPool(virStoragePoolObjPtr pool) { int retval =3D 0; virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); =20 - VIR_DEBUG("conn=3D%p, pool=3D%p", conn, pool); + VIR_DEBUG("pool=3D%p", pool); =20 def->allocation =3D def->capacity =3D def->available =3D 0; =20 diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index e901f370d5..d646b86c73 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -420,8 +420,7 @@ volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr = vol, } =20 static int -virStorageBackendRBDRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendRBDRefreshPool(virStoragePoolObjPtr pool) { size_t max_size =3D 1024; int ret =3D -1; @@ -602,8 +601,7 @@ virStorageBackendRBDCleanupSnapshots(rados_ioctx_t ioct= x, } =20 static int -virStorageBackendRBDDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendRBDDeleteVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { @@ -647,8 +645,7 @@ virStorageBackendRBDDeleteVol(virConnectPtr conn ATTRIB= UTE_UNUSED, =20 =20 static int -virStorageBackendRBDCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendRBDCreateVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -682,8 +679,7 @@ static int virStorageBackendRBDCreateImage(rados_ioctx_= t io, } =20 static int -virStorageBackendRBDBuildVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendRBDBuildVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { @@ -1038,8 +1034,7 @@ virStorageBackendRBDCloneImage(rados_ioctx_t io, } =20 static int -virStorageBackendRBDBuildVolFrom(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendRBDBuildVolFrom(virStoragePoolObjPtr pool, virStorageVolDefPtr newvol, virStorageVolDefPtr origvol, unsigned int flags) @@ -1068,8 +1063,7 @@ virStorageBackendRBDBuildVolFrom(virConnectPtr conn A= TTRIBUTE_UNUSED, } =20 static int -virStorageBackendRBDRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendRBDRefreshVol(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol) { virStorageBackendRBDStatePtr ptr =3D NULL; @@ -1089,8 +1083,7 @@ virStorageBackendRBDRefreshVol(virConnectPtr conn ATT= RIBUTE_UNUSED, } =20 static int -virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendRBDResizeVol(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol, unsigned long long capacity, unsigned int flags) @@ -1201,8 +1194,7 @@ virStorageBackendRBDVolWipeDiscard(rbd_image_t image, } =20 static int -virStorageBackendRBDVolWipe(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendRBDVolWipe(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backe= nd_scsi.c index 9347d66384..115df6c847 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -245,20 +245,20 @@ checkName(const char *name) * sysfs tree to get the parent 'scsi_host#' to ensure it matches. */ static bool -checkParent(virConnectPtr conn, - const char *name, +checkParent(const char *name, const char *parent_name) { unsigned int host_num; char *scsi_host_name =3D NULL; char *vhba_parent =3D NULL; bool retval =3D false; + virConnectPtr conn =3D NULL; =20 - VIR_DEBUG("conn=3D%p, name=3D%s, parent_name=3D%s", conn, name, parent= _name); + VIR_DEBUG("name=3D%s, parent_name=3D%s", name, parent_name); =20 - /* autostarted pool - assume we're OK */ + conn =3D virConnectOpen(geteuid() =3D=3D 0 ? "nodedev:///system" : "no= dedev:///session"); if (!conn) - return true; + return -1; =20 if (virSCSIHostGetNumber(parent_name, &host_num) < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -291,6 +291,7 @@ checkParent(virConnectPtr conn, retval =3D true; =20 cleanup: + virObjectUnref(conn); VIR_FREE(vhba_parent); VIR_FREE(scsi_host_name); return retval; @@ -298,8 +299,7 @@ checkParent(virConnectPtr conn, =20 =20 static int -createVport(virConnectPtr conn, - virStoragePoolDefPtr def, +createVport(virStoragePoolDefPtr def, const char *configFile, virStorageAdapterFCHostPtr fchost) { @@ -308,8 +308,8 @@ createVport(virConnectPtr conn, virThread thread; int ret =3D -1; =20 - VIR_DEBUG("conn=3D%p, configFile=3D'%s' parent=3D'%s', wwnn=3D'%s' wwp= n=3D'%s'", - conn, NULLSTR(configFile), NULLSTR(fchost->parent), + VIR_DEBUG("configFile=3D'%s' parent=3D'%s', wwnn=3D'%s' wwpn=3D'%s'", + NULLSTR(configFile), NULLSTR(fchost->parent), fchost->wwnn, fchost->wwpn); =20 /* If we find an existing HBA/vHBA within the fc_host sysfs @@ -322,7 +322,7 @@ createVport(virConnectPtr conn, =20 /* If a parent was provided, let's make sure the 'name' we've * retrieved has the same parent. If not this will cause failure. = */ - if (!fchost->parent || checkParent(conn, name, fchost->parent)) + if (!fchost->parent || checkParent(name, fchost->parent)) ret =3D 0; =20 goto cleanup; @@ -411,8 +411,7 @@ virStorageBackendSCSICheckPool(virStoragePoolObjPtr poo= l, } =20 static int -virStorageBackendSCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendSCSIRefreshPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); char *name =3D NULL; @@ -443,14 +442,13 @@ virStorageBackendSCSIRefreshPool(virConnectPtr conn A= TTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendSCSIStartPool(virConnectPtr conn, - virStoragePoolObjPtr pool) +virStorageBackendSCSIStartPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); const char *configFile =3D virStoragePoolObjGetConfigFile(pool); =20 if (def->source.adapter.type =3D=3D VIR_STORAGE_ADAPTER_TYPE_FC_HOST) - return createVport(conn, def, configFile, + return createVport(def, configFile, &def->source.adapter.data.fchost); =20 return 0; @@ -458,14 +456,22 @@ virStorageBackendSCSIStartPool(virConnectPtr conn, =20 =20 static int -virStorageBackendSCSIStopPool(virConnectPtr conn, - virStoragePoolObjPtr pool) +virStorageBackendSCSIStopPool(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); =20 - if (def->source.adapter.type =3D=3D VIR_STORAGE_ADAPTER_TYPE_FC_HOST) - return virNodeDeviceDeleteVport(conn, - &def->source.adapter.data.fchost); + if (def->source.adapter.type =3D=3D VIR_STORAGE_ADAPTER_TYPE_FC_HOST) { + virConnectPtr conn; + int ret; + conn =3D virConnectOpen(geteuid() =3D=3D 0 ? "nodedev:///system" := "nodedev:///session"); + if (!conn) + return -1; + + ret =3D virNodeDeviceDeleteVport(conn, + &def->source.adapter.data.fchost); + virObjectUnref(conn); + return ret; + } =20 return 0; } diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_b= ackend_sheepdog.c index 3d9c341a11..34c118fb32 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -38,8 +38,7 @@ =20 #define VIR_FROM_THIS VIR_FROM_STORAGE =20 -static int virStorageBackendSheepdogRefreshVol(virConnectPtr conn, - virStoragePoolObjPtr pool, +static int virStorageBackendSheepdogRefreshVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol); =20 void virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, @@ -112,8 +111,7 @@ virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, } =20 static int -virStorageBackendSheepdogAddVolume(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, const char *d= iskInfo) +virStorageBackendSheepdogAddVolume(virStoragePoolObjPtr pool, const char *= diskInfo) { virStorageVolDefPtr vol =3D NULL; =20 @@ -128,7 +126,7 @@ virStorageBackendSheepdogAddVolume(virConnectPtr conn A= TTRIBUTE_UNUSED, =20 vol->type =3D VIR_STORAGE_VOL_NETWORK; =20 - if (virStorageBackendSheepdogRefreshVol(conn, pool, vol) < 0) + if (virStorageBackendSheepdogRefreshVol(pool, vol) < 0) goto error; =20 if (virStoragePoolObjAddVol(pool, vol) < 0) @@ -142,8 +140,7 @@ virStorageBackendSheepdogAddVolume(virConnectPtr conn A= TTRIBUTE_UNUSED, } =20 static int -virStorageBackendSheepdogRefreshAllVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendSheepdogRefreshAllVol(virStoragePoolObjPtr pool) { int ret =3D -1; char *output =3D NULL; @@ -170,7 +167,7 @@ virStorageBackendSheepdogRefreshAllVol(virConnectPtr co= nn ATTRIBUTE_UNUSED, =20 if (cells !=3D NULL && virStringListLength((const char * const *)cells) > 2) { - if (virStorageBackendSheepdogAddVolume(conn, pool, cells[1]) <= 0) + if (virStorageBackendSheepdogAddVolume(pool, cells[1]) < 0) goto cleanup; } =20 @@ -190,8 +187,7 @@ virStorageBackendSheepdogRefreshAllVol(virConnectPtr co= nn ATTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendSheepdogRefreshPool(virStoragePoolObjPtr pool) { int ret =3D -1; char *output =3D NULL; @@ -207,7 +203,7 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn= ATTRIBUTE_UNUSED, output) < 0) goto cleanup; =20 - ret =3D virStorageBackendSheepdogRefreshAllVol(conn, pool); + ret =3D virStorageBackendSheepdogRefreshAllVol(pool); cleanup: virCommandFree(cmd); VIR_FREE(output); @@ -216,8 +212,7 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn= ATTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendSheepdogDeleteVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { @@ -234,8 +229,7 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn A= TTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendSheepdogCreateVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -263,8 +257,7 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn A= TTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendSheepdogBuildVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendSheepdogBuildVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { @@ -354,8 +347,7 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefP= tr vol, } =20 static int -virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendSheepdogRefreshVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { int ret; @@ -389,8 +381,7 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn = ATTRIBUTE_UNUSED, =20 =20 static int -virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendSheepdogResizeVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned long long capacity, unsigned int flags) diff --git a/src/storage/storage_backend_vstorage.c b/src/storage/storage_b= ackend_vstorage.c index 2dc26af387..076617aeb6 100644 --- a/src/storage/storage_backend_vstorage.c +++ b/src/storage/storage_backend_vstorage.c @@ -17,7 +17,6 @@ VIR_LOG_INIT("storage.storage_backend_vstorage"); =20 =20 /** - * @conn connection to report errors against * @pool storage pool to build * @flags controls the pool formatting behaviour * @@ -26,8 +25,7 @@ VIR_LOG_INIT("storage.storage_backend_vstorage"); * Returns 0 on success, -1 on error */ static int -virStorageBackendVzPoolBuild(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendVzPoolBuild(virStoragePoolObjPtr pool, unsigned int flags) { virCheckFlags(0, -1); @@ -37,8 +35,7 @@ virStorageBackendVzPoolBuild(virConnectPtr conn ATTRIBUTE= _UNUSED, =20 =20 static int -virStorageBackendVzPoolStart(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendVzPoolStart(virStoragePoolObjPtr pool) { int ret =3D -1; virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -125,8 +122,7 @@ virStorageBackendVzIsMounted(virStoragePoolObjPtr pool) =20 =20 static int -virStorageBackendVzPoolStop(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendVzPoolStop(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); virCommandPtr cmd =3D NULL; diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backen= d_zfs.c index 198c788aca..ec39d9403b 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -228,8 +228,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, } =20 static int -virStorageBackendZFSRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) +virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); virCommandPtr cmd =3D NULL; @@ -305,8 +304,7 @@ virStorageBackendZFSRefreshPool(virConnectPtr conn ATTR= IBUTE_UNUSED, } =20 static int -virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendZFSCreateVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -377,8 +375,7 @@ virStorageBackendZFSCreateVol(virConnectPtr conn ATTRIB= UTE_UNUSED, } =20 static int -virStorageBackendZFSDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendZFSDeleteVol(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { @@ -403,8 +400,7 @@ virStorageBackendZFSDeleteVol(virConnectPtr conn ATTRIB= UTE_UNUSED, } =20 static int -virStorageBackendZFSBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendZFSBuildPool(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -437,8 +433,7 @@ virStorageBackendZFSBuildPool(virConnectPtr conn ATTRIB= UTE_UNUSED, } =20 static int -virStorageBackendZFSDeletePool(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendZFSDeletePool(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 5d21007edb..ca5ed3d970 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -136,9 +136,9 @@ storagePoolUpdateStateCallback(virStoragePoolObjPtr obj, */ if (active) { virStoragePoolObjClearVols(obj); - if (backend->refreshPool(NULL, obj) < 0) { + if (backend->refreshPool(obj) < 0) { if (backend->stopPool) - backend->stopPool(NULL, obj); + backend->stopPool(obj); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to restart storage pool '%s': %s"), def->name, virGetLastErrorMessage()); @@ -171,10 +171,9 @@ storagePoolUpdateAllState(void) =20 static void storageDriverAutostartCallback(virStoragePoolObjPtr obj, - const void *opaque) + const void *opaque ATTRIBUTE_UNUSED) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(obj); - virConnectPtr conn =3D (virConnectPtr) opaque; virStorageBackendPtr backend; bool started =3D false; =20 @@ -184,7 +183,7 @@ storageDriverAutostartCallback(virStoragePoolObjPtr obj, if (virStoragePoolObjIsAutostart(obj) && !virStoragePoolObjIsActive(obj)) { if (backend->startPool && - backend->startPool(conn, obj) < 0) { + backend->startPool(obj) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to autostart storage pool '%s': %s"), def->name, virGetLastErrorMessage()); @@ -200,11 +199,11 @@ storageDriverAutostartCallback(virStoragePoolObjPtr o= bj, stateFile =3D virFileBuildPath(driver->stateDir, def->name, ".xml"= ); if (!stateFile || virStoragePoolSaveState(stateFile, def) < 0 || - backend->refreshPool(conn, obj) < 0) { + backend->refreshPool(obj) < 0) { if (stateFile) unlink(stateFile); if (backend->stopPool) - backend->stopPool(conn, obj); + backend->stopPool(obj); virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to autostart storage pool '%s': %s"), def->name, virGetLastErrorMessage()); @@ -221,16 +220,9 @@ storageDriverAutostart(void) { virConnectPtr conn =3D NULL; =20 - /* XXX Remove hardcoding of QEMU URI */ - if (driver->privileged) - conn =3D virConnectOpen("qemu:///system"); - else - conn =3D virConnectOpen("qemu:///session"); - /* Ignoring NULL conn - let backends decide */ - virStoragePoolObjListForEach(driver->pools, storageDriverAutostartCallback, - conn); + NULL); =20 virObjectUnref(conn); } @@ -651,7 +643,7 @@ storageConnectFindStoragePoolSources(virConnectPtr conn, goto cleanup; } =20 - ret =3D backend->findPoolSources(conn, srcSpec, flags); + ret =3D backend->findPoolSources(srcSpec, flags); =20 cleanup: return ret; @@ -751,7 +743,7 @@ storagePoolCreateXML(virConnectPtr conn, =20 if (build_flags || (flags & VIR_STORAGE_POOL_CREATE_WITH_BUILD)) { - if (backend->buildPool(conn, obj, build_flags) < 0) { + if (backend->buildPool(obj, build_flags) < 0) { virStoragePoolObjRemove(driver->pools, obj); virObjectUnref(obj); obj =3D NULL; @@ -761,7 +753,7 @@ storagePoolCreateXML(virConnectPtr conn, } =20 if (backend->startPool && - backend->startPool(conn, obj) < 0) { + backend->startPool(obj) < 0) { virStoragePoolObjRemove(driver->pools, obj); virObjectUnref(obj); obj =3D NULL; @@ -772,11 +764,11 @@ storagePoolCreateXML(virConnectPtr conn, =20 virStoragePoolObjClearVols(obj); if (!stateFile || virStoragePoolSaveState(stateFile, def) < 0 || - backend->refreshPool(conn, obj) < 0) { + backend->refreshPool(obj) < 0) { if (stateFile) unlink(stateFile); if (backend->stopPool) - backend->stopPool(conn, obj); + backend->stopPool(obj); virStoragePoolObjRemove(driver->pools, obj); virObjectUnref(obj); obj =3D NULL; @@ -963,25 +955,25 @@ storagePoolCreate(virStoragePoolPtr pool, =20 if (build_flags || (flags & VIR_STORAGE_POOL_CREATE_WITH_BUILD)) { - if (backend->buildPool(pool->conn, obj, build_flags) < 0) + if (backend->buildPool(obj, build_flags) < 0) goto cleanup; } } =20 VIR_INFO("Starting up storage pool '%s'", def->name); if (backend->startPool && - backend->startPool(pool->conn, obj) < 0) + backend->startPool(obj) < 0) goto cleanup; =20 stateFile =3D virFileBuildPath(driver->stateDir, def->name, ".xml"); =20 virStoragePoolObjClearVols(obj); if (!stateFile || virStoragePoolSaveState(stateFile, def) < 0 || - backend->refreshPool(pool->conn, obj) < 0) { + backend->refreshPool(obj) < 0) { if (stateFile) unlink(stateFile); if (backend->stopPool) - backend->stopPool(pool->conn, obj); + backend->stopPool(obj); goto cleanup; } =20 @@ -1029,7 +1021,7 @@ storagePoolBuild(virStoragePoolPtr pool, } =20 if (backend->buildPool && - backend->buildPool(pool->conn, obj, flags) < 0) + backend->buildPool(obj, flags) < 0) goto cleanup; =20 event =3D virStoragePoolEventLifecycleNew(def->name, @@ -1089,7 +1081,7 @@ storagePoolDestroy(virStoragePoolPtr pool) VIR_FREE(stateFile); =20 if (backend->stopPool && - backend->stopPool(pool->conn, obj) < 0) + backend->stopPool(obj) < 0) goto cleanup; =20 virStoragePoolObjClearVols(obj); @@ -1160,7 +1152,7 @@ storagePoolDelete(virStoragePoolPtr pool, "%s", _("pool does not support pool deletion")); goto cleanup; } - if (backend->deletePool(pool->conn, obj, flags) < 0) + if (backend->deletePool(obj, flags) < 0) goto cleanup; =20 event =3D virStoragePoolEventLifecycleNew(def->name, @@ -1214,9 +1206,9 @@ storagePoolRefresh(virStoragePoolPtr pool, } =20 virStoragePoolObjClearVols(obj); - if (backend->refreshPool(pool->conn, obj) < 0) { + if (backend->refreshPool(obj) < 0) { if (backend->stopPool) - backend->stopPool(pool->conn, obj); + backend->stopPool(obj); =20 event =3D virStoragePoolEventLifecycleNew(def->name, def->uuid, @@ -1723,8 +1715,7 @@ storagePoolLookupByTargetPath(virConnectPtr conn, =20 =20 static int -storageVolDeleteInternal(virStorageVolPtr vol, - virStorageBackendPtr backend, +storageVolDeleteInternal(virStorageBackendPtr backend, virStoragePoolObjPtr obj, virStorageVolDefPtr voldef, unsigned int flags, @@ -1740,7 +1731,7 @@ storageVolDeleteInternal(virStorageVolPtr vol, goto cleanup; } =20 - if (backend->deleteVol(vol->conn, obj, voldef, flags) < 0) + if (backend->deleteVol(obj, voldef, flags) < 0) goto cleanup; =20 /* The disk backend updated the pool data including removing the @@ -1838,7 +1829,7 @@ storageVolDelete(virStorageVolPtr vol, goto cleanup; } =20 - if (storageVolDeleteInternal(vol, backend, obj, voldef, flags, true) <= 0) + if (storageVolDeleteInternal(backend, obj, voldef, flags, true) < 0) goto cleanup; =20 ret =3D 0; @@ -1906,7 +1897,7 @@ storageVolCreateXML(virStoragePoolPtr pool, /* Wipe any key the user may have suggested, as volume creation * will generate the canonical key. */ VIR_FREE(voldef->key); - if (backend->createVol(pool->conn, obj, voldef) < 0) + if (backend->createVol(obj, voldef) < 0) goto cleanup; =20 if (!(newvol =3D virGetStorageVol(pool->conn, def->name, voldef->name, @@ -1937,7 +1928,7 @@ storageVolCreateXML(virStoragePoolPtr pool, voldef->building =3D true; virObjectUnlock(obj); =20 - buildret =3D backend->buildVol(pool->conn, obj, buildvoldef, flags= ); + buildret =3D backend->buildVol(obj, buildvoldef, flags); =20 VIR_FREE(buildvoldef); =20 @@ -1956,8 +1947,8 @@ storageVolCreateXML(virStoragePoolPtr pool, } =20 if (backend->refreshVol && - backend->refreshVol(pool->conn, obj, voldef) < 0) { - storageVolDeleteInternal(newvol, backend, obj, voldef, + backend->refreshVol(obj, voldef) < 0) { + storageVolDeleteInternal(backend, obj, voldef, 0, false); voldef =3D NULL; goto cleanup; @@ -2096,14 +2087,14 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, } =20 if (backend->refreshVol && - backend->refreshVol(pool->conn, obj, voldefsrc) < 0) + backend->refreshVol(obj, voldefsrc) < 0) goto cleanup; =20 /* 'Define' the new volume so we get async progress reporting. * Wipe any key the user may have suggested, as volume creation * will generate the canonical key. */ VIR_FREE(voldef->key); - if (backend->createVol(pool->conn, obj, voldef) < 0) + if (backend->createVol(obj, voldef) < 0) goto cleanup; =20 /* Make a shallow copy of the 'defined' volume definition, since the @@ -2134,7 +2125,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, virObjectUnlock(objsrc); } =20 - buildret =3D backend->buildVolFrom(pool->conn, obj, shadowvol, voldefs= rc, flags); + buildret =3D backend->buildVolFrom(obj, shadowvol, voldefsrc, flags); =20 virObjectLock(obj); if (objsrc) @@ -2151,8 +2142,8 @@ storageVolCreateXMLFrom(virStoragePoolPtr pool, =20 if (buildret < 0 || (backend->refreshVol && - backend->refreshVol(pool->conn, obj, voldef) < 0)) { - storageVolDeleteInternal(newvol, backend, obj, voldef, 0, false); + backend->refreshVol(obj, voldef) < 0)) { + storageVolDeleteInternal(backend, obj, voldef, 0, false); voldef =3D NULL; goto cleanup; } @@ -2215,7 +2206,7 @@ storageVolDownload(virStorageVolPtr vol, goto cleanup; } =20 - ret =3D backend->downloadVol(vol->conn, obj, voldef, stream, + ret =3D backend->downloadVol(obj, voldef, stream, offset, length, flags); =20 cleanup: @@ -2317,7 +2308,7 @@ virStorageVolPoolRefreshThread(void *opaque) goto cleanup; =20 virStoragePoolObjClearVols(obj); - if (backend->refreshPool(NULL, obj) < 0) + if (backend->refreshPool(obj) < 0) VIR_DEBUG("Failed to refresh storage pool"); =20 event =3D virStoragePoolEventRefreshNew(def->name, def->uuid); @@ -2410,7 +2401,7 @@ storageVolUpload(virStorageVolPtr vol, VIR_STRDUP(cbdata->vol_path, voldef->target.path) < 0) goto cleanup; =20 - if ((ret =3D backend->uploadVol(vol->conn, obj, voldef, stream, + if ((ret =3D backend->uploadVol(obj, voldef, stream, offset, length, flags)) < 0) goto cleanup; =20 @@ -2508,7 +2499,7 @@ storageVolResize(virStorageVolPtr vol, goto cleanup; } =20 - if (backend->resizeVol(vol->conn, obj, voldef, abs_capacity, flags) < = 0) + if (backend->resizeVol(obj, voldef, abs_capacity, flags) < 0) goto cleanup; =20 voldef->target.capacity =3D abs_capacity; @@ -2578,7 +2569,7 @@ storageVolWipePattern(virStorageVolPtr vol, goto cleanup; } =20 - if (backend->wipeVol(vol->conn, obj, voldef, algorithm, flags) < 0) + if (backend->wipeVol(obj, voldef, algorithm, flags) < 0) goto cleanup; =20 /* Instead of using the refreshVol, since much changes on the target @@ -2625,7 +2616,7 @@ storageVolGetInfoFlags(virStorageVolPtr vol, goto cleanup; =20 if (backend->refreshVol && - backend->refreshVol(vol->conn, obj, voldef) < 0) + backend->refreshVol(obj, voldef) < 0) goto cleanup; =20 memset(info, 0, sizeof(*info)); @@ -2671,7 +2662,7 @@ storageVolGetXMLDesc(virStorageVolPtr vol, goto cleanup; =20 if (backend->refreshVol && - backend->refreshVol(vol->conn, obj, voldef) < 0) + backend->refreshVol(obj, voldef) < 0) goto cleanup; =20 ret =3D virStorageVolDefFormat(def, voldef); diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 5995921570..7fb4a7733e 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -222,8 +222,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } =20 static int -storageBackendCreateBlockFrom(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +storageBackendCreateBlockFrom(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -390,8 +389,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, } =20 static int -storageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +storageBackendCreateRaw(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -690,8 +688,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr= pool, /* Create ploop directory with ploop image and DiskDescriptor.xml * if function fails to create image file the directory will be deleted.*/ static int -storageBackendCreatePloop(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +storageBackendCreatePloop(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -1376,8 +1373,7 @@ storageBackendCreateQemuImgSecretPath(virStoragePoolO= bjPtr pool, =20 =20 static int -storageBackendCreateQemuImg(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +storageBackendCreateQemuImg(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -1459,7 +1455,7 @@ virStorageBackendCreateVolUsingQemuImg(virStoragePool= ObjPtr pool, changeFormat =3D true; } =20 - ret =3D storageBackendCreateQemuImg(NULL, pool, vol, inputvol, flags); + ret =3D storageBackendCreateQemuImg(pool, vol, inputvol, flags); =20 if (changeFormat) vol->target.format =3D VIR_STORAGE_FILE_NONE; @@ -2078,8 +2074,7 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, =20 /* Common/Local File System/Directory Volume API's */ static int -createFileDir(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +createFileDir(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -2125,8 +2120,7 @@ createFileDir(virConnectPtr conn ATTRIBUTE_UNUSED, * function), and can drop the parent pool lock during the (slow) allocati= on. */ int -virStorageBackendVolCreateLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendVolCreateLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -2164,8 +2158,7 @@ virStorageBackendVolCreateLocal(virConnectPtr conn AT= TRIBUTE_UNUSED, =20 =20 static int -storageBackendVolBuildLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +storageBackendVolBuildLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -2194,7 +2187,7 @@ storageBackendVolBuildLocal(virConnectPtr conn, create_func =3D storageBackendCreateQemuImg; } =20 - if (create_func(conn, pool, vol, inputvol, flags) < 0) + if (create_func(pool, vol, inputvol, flags) < 0) return -1; return 0; } @@ -2206,12 +2199,11 @@ storageBackendVolBuildLocal(virConnectPtr conn, * special kinds of files */ int -virStorageBackendVolBuildLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendVolBuildLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags) { - return storageBackendVolBuildLocal(conn, pool, vol, NULL, flags); + return storageBackendVolBuildLocal(pool, vol, NULL, flags); } =20 =20 @@ -2219,13 +2211,12 @@ virStorageBackendVolBuildLocal(virConnectPtr conn, * Create a storage vol using 'inputvol' as input */ int -virStorageBackendVolBuildFromLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +virStorageBackendVolBuildFromLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) { - return storageBackendVolBuildLocal(conn, pool, vol, inputvol, flags); + return storageBackendVolBuildLocal(pool, vol, inputvol, flags); } =20 =20 @@ -2233,8 +2224,7 @@ virStorageBackendVolBuildFromLocal(virConnectPtr conn, * Remove a volume - no support for BLOCK and NETWORK yet */ int -virStorageBackendVolDeleteLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol, unsigned int flags) { @@ -2335,8 +2325,7 @@ storageBackendLoadDefaultSecrets(virStorageVolDefPtr = vol) * Update info about a volume's capacity/allocation */ int -virStorageBackendVolRefreshLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSE= D, +virStorageBackendVolRefreshLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSE= D, virStorageVolDefPtr vol) { int ret; @@ -2429,8 +2418,7 @@ storageBackendResizeQemuImg(virStoragePoolObjPtr pool, * Resize a volume */ int -virStorageBackendVolResizeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendVolResizeLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned long long capacity, unsigned int flags) @@ -2509,8 +2497,7 @@ storageBackendPloopHasSnapshots(char *path) =20 =20 int -virStorageBackendVolUploadLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, @@ -2556,8 +2543,7 @@ virStorageBackendVolUploadLocal(virConnectPtr conn AT= TRIBUTE_UNUSED, } =20 int -virStorageBackendVolDownloadLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUS= ED, +virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUS= ED, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, @@ -2854,8 +2840,7 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, =20 =20 int -virStorageBackendVolWipeLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags) @@ -2954,8 +2939,7 @@ virStorageBackendBuildLocal(virStoragePoolObjPtr pool) * Returns 0 on success, -1 on error */ int -virStorageBackendDeleteLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool, +virStorageBackendDeleteLocal(virStoragePoolObjPtr pool, unsigned int flags) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -3696,8 +3680,7 @@ virStorageBackendRefreshVolTargetUpdate(virStorageVol= DefPtr vol) * within it. This is non-recursive. */ int -virStorageBackendRefreshLocal(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolObjPtr pool) +virStorageBackendRefreshLocal(virStoragePoolObjPtr pool) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); DIR *dir; diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index ffc83c60ab..e9cb982115 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -38,54 +38,45 @@ virStorageBackendBuildVolFrom virStorageBackendGetBuildVolFromFunction(virStorageVolDefPtr vol, virStorageVolDefPtr inputvol); =20 -int virStorageBackendVolCreateLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolCreateLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol); =20 -int virStorageBackendVolBuildLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolBuildLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags); =20 -int virStorageBackendVolBuildFromLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolBuildFromLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags); =20 -int virStorageBackendVolDeleteLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int flags); =20 -int virStorageBackendVolRefreshLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolRefreshLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol); =20 -int virStorageBackendVolResizeLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolResizeLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned long long capacity, unsigned int flags); =20 -int virStorageBackendVolUploadLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, unsigned long long len, unsigned int flags); =20 -int virStorageBackendVolDownloadLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, unsigned long long len, unsigned int flags); =20 -int virStorageBackendVolWipeLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags); @@ -93,15 +84,13 @@ int virStorageBackendVolWipeLocal(virConnectPtr conn, /* Local/Common Storage Pool Backend APIs */ int virStorageBackendBuildLocal(virStoragePoolObjPtr pool); =20 -int virStorageBackendDeleteLocal(virConnectPtr conn, - virStoragePoolObjPtr pool, +int virStorageBackendDeleteLocal(virStoragePoolObjPtr pool, unsigned int flags); =20 int virStorageBackendRefreshVolTargetUpdate(virStorageVolDefPtr vol); =20 -int virStorageBackendRefreshLocal(virConnectPtr conn, - virStoragePoolObjPtr pool); +int virStorageBackendRefreshLocal(virStoragePoolObjPtr pool); =20 int virStorageUtilGlusterExtractPoolSources(const char *host, const char *xml, diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 1cd083766a..5857d5e350 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -47,16 +47,12 @@ testCompareXMLToArgvFiles(bool shouldFail, int ret =3D -1; =20 virCommandPtr cmd =3D NULL; - virConnectPtr conn; =20 virStorageVolDefPtr vol =3D NULL, inputvol =3D NULL; virStoragePoolDefPtr def =3D NULL; virStoragePoolDefPtr inputpool =3D NULL; virStoragePoolObjPtr obj =3D NULL; =20 - if (!(conn =3D virGetConnect())) - goto cleanup; - if (!(def =3D virStoragePoolDefParseFile(poolxml))) goto cleanup; =20 @@ -84,7 +80,7 @@ testCompareXMLToArgvFiles(bool shouldFail, testSetVolumeType(vol, def); testSetVolumeType(inputvol, inputpool); =20 - cmd =3D virStorageBackendCreateQemuImgCmdFromVol(conn, obj, vol, + cmd =3D virStorageBackendCreateQemuImgCmdFromVol(obj, vol, inputvol, flags, create_tool, imgformat, NULL); @@ -111,7 +107,6 @@ testCompareXMLToArgvFiles(bool shouldFail, virCommandFree(cmd); VIR_FREE(actualCmdline); virStoragePoolObjEndAPI(&obj); - virObjectUnref(conn); return ret; } =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list