- Devel - libvirt List Archives

[libvirt] [PATCH] util: Alter return value of virReadFCHost and fix mem leak
by John Ferlan 11 Oct '16

11 Oct '16

https://bugzilla.redhat.com/show_bug.cgi?id=1357416 Rather than return a 0 or -1 and the *result string, return just the result string to the caller. Alter all the callers to handle the different return. As a side effect or result of this, it's much clearer that we cannot just assign the returned string into the scsi_host wwnn, wwpn, and fabric_wwn fields - rather we should fetch a temporary string, then as long as our fetch was good, VIR_FREE what may have been there, and STEAL what we just got. This fixes a memory leak in the virNodeDeviceCreateXML code path through find_new_device and nodeDeviceLookupSCSIHostByWWN which will continually call nodeDeviceSysfsGetSCSIHostCaps until the expected wwnn/wwpn is found in the device object capabilities. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I suppose I could have made two patches out of this, but it felt like overkill once I realized what the issue was. OK a third one line patch could have been added to change the virGetFCHostNameByWWN comment as well, but that'd really be overkill. src/node_device/node_device_linux_sysfs.c | 55 ++++++++++++------------------- src/util/virutil.c | 34 ++++++++----------- src/util/virutil.h | 9 +++-- tests/fchosttest.c | 30 ++++++----------- 4 files changed, 49 insertions(+), 79 deletions(-) diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 549d32c..be99c41 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -44,8 +44,7 @@ VIR_LOG_INIT("node_device.node_device_linux_sysfs"); int nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) { - char *max_vports = NULL; - char *vports = NULL; + char *tmp = NULL; int ret = -1; if (virReadSCSIUniqueId(NULL, d->scsi_host.host, @@ -59,64 +58,53 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) if (virIsCapableFCHost(NULL, d->scsi_host.host)) { d->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST; - if (virReadFCHost(NULL, - d->scsi_host.host, - "port_name", - &d->scsi_host.wwpn) < 0) { + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "port_name"))) { VIR_WARN("Failed to read WWPN for host%d", d->scsi_host.host); goto cleanup; } + VIR_FREE(d->scsi_host.wwpn); + VIR_STEAL_PTR(d->scsi_host.wwpn, tmp); - if (virReadFCHost(NULL, - d->scsi_host.host, - "node_name", - &d->scsi_host.wwnn) < 0) { + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "node_name"))) { VIR_WARN("Failed to read WWNN for host%d", d->scsi_host.host); goto cleanup; } + VIR_FREE(d->scsi_host.wwnn); + VIR_STEAL_PTR(d->scsi_host.wwnn, tmp); - if (virReadFCHost(NULL, - d->scsi_host.host, - "fabric_name", - &d->scsi_host.fabric_wwn) < 0) { + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, "fabric_name"))) { VIR_WARN("Failed to read fabric WWN for host%d", d->scsi_host.host); goto cleanup; } + VIR_FREE(d->scsi_host.fabric_wwn); + VIR_STEAL_PTR(d->scsi_host.fabric_wwn, tmp); } if (virIsCapableVport(NULL, d->scsi_host.host)) { d->scsi_host.flags |= VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS; - if (virReadFCHost(NULL, - d->scsi_host.host, - "max_npiv_vports", - &max_vports) < 0) { + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, + "max_npiv_vports"))) { VIR_WARN("Failed to read max_npiv_vports for host%d", d->scsi_host.host); goto cleanup; } - if (virReadFCHost(NULL, - d->scsi_host.host, - "npiv_vports_inuse", - &vports) < 0) { - VIR_WARN("Failed to read npiv_vports_inuse for host%d", - d->scsi_host.host); + if (virStrToLong_i(tmp, NULL, 10, &d->scsi_host.max_vports) < 0) { + VIR_WARN("Failed to parse value of max_npiv_vports '%s'", tmp); goto cleanup; } - if (virStrToLong_i(max_vports, NULL, 10, - &d->scsi_host.max_vports) < 0) { - VIR_WARN("Failed to parse value of max_npiv_vports '%s'", - max_vports); + if (!(tmp = virReadFCHost(NULL, d->scsi_host.host, + "npiv_vports_inuse"))) { + VIR_WARN("Failed to read npiv_vports_inuse for host%d", + d->scsi_host.host); goto cleanup; } - if (virStrToLong_i(vports, NULL, 10, - &d->scsi_host.vports) < 0) { - VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", - vports); + if (virStrToLong_i(tmp, NULL, 10, &d->scsi_host.vports) < 0) { + VIR_WARN("Failed to parse value of npiv_vports_inuse '%s'", tmp); goto cleanup; } } @@ -132,8 +120,7 @@ nodeDeviceSysfsGetSCSIHostCaps(virNodeDevCapDataPtr d) VIR_FREE(d->scsi_host.wwpn); VIR_FREE(d->scsi_host.fabric_wwn); } - VIR_FREE(max_vports); - VIR_FREE(vports); + VIR_FREE(tmp); return ret; } diff --git a/src/util/virutil.c b/src/util/virutil.c index b57a195..2459d2d 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -2008,24 +2008,21 @@ virGetSCSIHostNameByParentaddr(unsigned int domain, * @sysfs_prefix: "fc_host" sysfs path, defaults to SYSFS_FC_HOST_PATH * @host: Host number, E.g. 5 of "fc_host/host5" * @entry: Name of the sysfs entry to read - * @result: Return the entry value as string * * Read the value of sysfs "fc_host" entry. * - * Returns 0 on success, and @result is filled with the entry value. - * as string, Otherwise returns -1. Caller must free @result after - * use. + * Returns result as a stringon success, caller must free @result after + * Otherwise returns NULL. */ -int +char * virReadFCHost(const char *sysfs_prefix, int host, - const char *entry, - char **result) + const char *entry) { char *sysfs_path = NULL; char *p = NULL; - int ret = -1; char *buf = NULL; + char *result = NULL; if (virAsprintf(&sysfs_path, "%s/host%d/%s", sysfs_prefix ? sysfs_prefix : SYSFS_FC_HOST_PATH, @@ -2043,14 +2040,12 @@ virReadFCHost(const char *sysfs_prefix, else p = buf; - if (VIR_STRDUP(*result, p) < 0) - goto cleanup; + ignore_value(VIR_STRDUP(result, p)); - ret = 0; cleanup: VIR_FREE(sysfs_path); VIR_FREE(buf); - return ret; + return result; } bool @@ -2171,7 +2166,7 @@ virManageVport(const int parent_host, return ret; } -/* virGetHostNameByWWN: +/* virGetFCHostNameByWWN: * * Iterate over the sysfs tree to get FC host name (e.g. host5) * by the provided "wwnn,wwpn" pair. @@ -2298,7 +2293,7 @@ virFindFCHostCapableVport(const char *sysfs_prefix) if (!virIsCapableVport(prefix, host)) continue; - if (virReadFCHost(prefix, host, "port_state", &state) < 0) { + if (!(state = virReadFCHost(prefix, host, "port_state"))) { VIR_DEBUG("Failed to read port_state for host%d", host); continue; } @@ -2310,12 +2305,12 @@ virFindFCHostCapableVport(const char *sysfs_prefix) } VIR_FREE(state); - if (virReadFCHost(prefix, host, "max_npiv_vports", &max_vports) < 0) { + if (!(max_vports = virReadFCHost(prefix, host, "max_npiv_vports"))) { VIR_DEBUG("Failed to read max_npiv_vports for host%d", host); continue; } - if (virReadFCHost(prefix, host, "npiv_vports_inuse", &vports) < 0) { + if (!(vports = virReadFCHost(prefix, host, "npiv_vports_inuse"))) { VIR_DEBUG("Failed to read npiv_vports_inuse for host%d", host); VIR_FREE(max_vports); continue; @@ -2379,14 +2374,13 @@ virGetSCSIHostNameByParentaddr(unsigned int domain ATTRIBUTE_UNUSED, return NULL; } -int +char * virReadFCHost(const char *sysfs_prefix ATTRIBUTE_UNUSED, int host ATTRIBUTE_UNUSED, - const char *entry ATTRIBUTE_UNUSED, - char **result ATTRIBUTE_UNUSED) + const char *entry ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")); - return -1; + return NULL; } bool diff --git a/src/util/virutil.h b/src/util/virutil.h index 703ec53..8c0d83c 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -182,11 +182,10 @@ virGetSCSIHostNameByParentaddr(unsigned int domain, unsigned int slot, unsigned int function, unsigned int unique_id); -int virReadFCHost(const char *sysfs_prefix, - int host, - const char *entry, - char **result) - ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); +char *virReadFCHost(const char *sysfs_prefix, + int host, + const char *entry) + ATTRIBUTE_NONNULL(3); bool virIsCapableFCHost(const char *sysfs_prefix, int host); bool virIsCapableVport(const char *sysfs_prefix, int host); diff --git a/tests/fchosttest.c b/tests/fchosttest.c index e9b89a7..a08a2e8 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -68,35 +68,25 @@ test3(const void *data ATTRIBUTE_UNUSED) char *vports = NULL; int ret = -1; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "node_name", - &wwnn) < 0) + if (!(wwnn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "node_name"))) return -1; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "port_name", - &wwpn) < 0) + if (!(wwpn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "port_name"))) goto cleanup; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "fabric_name", - &fabric_wwn) < 0) + if (!(fabric_wwn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "fabric_name"))) goto cleanup; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "max_npiv_vports", - &max_vports) < 0) + if (!(max_vports = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "max_npiv_vports"))) goto cleanup; - if (virReadFCHost(TEST_FC_HOST_PREFIX, - TEST_FC_HOST_NUM, - "npiv_vports_inuse", - &vports) < 0) + if (!(vports = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM, + "npiv_vports_inuse"))) goto cleanup; if (STRNEQ(expect_wwnn, wwnn) || -- 2.7.4

1 0

[libvirt] [Fwd: Re: [PATCH 2/4] vbox: replace vboxGlobalData with vboxPrivate.]
by Dawid Zamirski 11 Oct '16

11 Oct '16

Sorry, forgot to CC the ML in my last reply. -------- Forwarded Message -------- From: Dawid Zamirski <dzamirski(a)datto.com> To: Martin Kletzander <mkletzan(a)redhat.com> Subject: Re: [libvirt] [PATCH 2/4] vbox: replace vboxGlobalData with vboxPrivate. Date: Tue, 11 Oct 2016 10:43:23 -0400 On Tue, 2016-10-11 at 15:47 +0200, Martin Kletzander wrote: > > > and this (and others) you *just* cast it to different struct. That's > not good. I'm guessing this is still just a differently separated > commit. Yes, this was to just make simple changes all over the code base but keep the commit in "compilable" state for bisecting reasons. Same goes for the first patch in the series.

1 0

[libvirt] [PATCH] libvirt-guests: Weaken dependency on libvirtd
by Andrea Bolognani 11 Oct '16

11 Oct '16

The Requires relationship is very strong, in that it prevents a unit from running unless all the units it Requires are running as well. This turns out to be a problem because we want to be able to restart libvirtd at any time without having libvirt-guests suspend or shutdown running guests. Turn the Requires relationship into a Wants relationship: this way starting libvirt-guests will cause systemd to (attempt to) start libvirtd as well, but stopping or restarting libvirtd will not alter libvirt-guests' running state. --- tools/libvirt-guests.service.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in index b4f54f2..02e6747 100644 --- a/tools/libvirt-guests.service.in +++ b/tools/libvirt-guests.service.in @@ -1,6 +1,6 @@ [Unit] Description=Suspend/Resume Running libvirt Guests -Requires=libvirtd.service +Wants=libvirtd.service After=network.target After=time-sync.target After=libvirtd.service -- 2.7.4

3 4

[libvirt] [PATCH 0/4] systemd-related fixes and improvements
by Andrea Bolognani 11 Oct '16

11 Oct '16

Make libvirt on systemd nicer for the user, by getting rid of some confusing behavior, and overall more solid. More details in each specific patch. Andrea Bolognani (4): virtlogd.socket: Tie lifecycle to libvirtd.service libvirt-guests.service: Improve description libvirt-guests.service: Split After= relationship libvirt-guests.service: Add Requires=libvirtd.service daemon/libvirtd.service.in | 1 + src/logging/virtlogd.service.in | 2 ++ src/logging/virtlogd.socket.in | 2 ++ tools/libvirt-guests.service.in | 7 +++++-- 4 files changed, 10 insertions(+), 2 deletions(-) -- 2.7.4

3 14

[libvirt] [OSSTEST PATCH 0/2] libvirt: Fix save/restore capability check on ARM
by Ian Jackson 11 Oct '16

11 Oct '16

Currently, osstest, the Xen Project's automated test framework, erroneously thinks that save/restore is supported with libvirt on ARM. In fact, save/restore is not supported by Xen on ARM at all. The result is that osstest then actually attempts the save/restore, and abandons the test job as a failure. This is not desirable. In these two patches I try to fix the feature detection to get this right. I'd appreciate advice about whether I have done the right thing. My code is based partly on empirical observation of the output of `virsh capabilities' on x86 and ARM. (See below.) Thanks, Ian. >From baroque0, x86. As left by 101253.test-amd64-amd64-libvirt-pair; osstest "branch" osstest <capabilities> <host> <cpu> <arch>x86_64</arch> <features> <pae/> </features> <model>Haswell-noTSX</model> <topology sockets='1' cores='4' threads='2'/> <feature name='vme'/> <feature name='ds'/> <feature name='acpi'/> <feature name='ht'/> <feature name='tm'/> <feature name='pbe'/> <feature name='dtes64'/> <feature name='monitor'/> <feature name='ds_cpl'/> <feature name='vmx'/> <feature name='smx'/> <feature name='est'/> <feature name='tm2'/> <feature name='xtpr'/> <feature name='pdcm'/> <feature name='f16c'/> <feature name='rdrand'/> <feature name='tsc_adjust'/> <feature name='xsaveopt'/> <feature name='pdpe1gb'/> <feature name='abm'/> <feature name='invtsc'/> </cpu> <power_management/> <migration_features> <live/> </migration_features> <netprefix>vif</netprefix> <topology> <cells num='1'> <cell id='0'> <memory unit='KiB'>9699328</memory> <cpus num='8'> <cpu id='0' socket_id='0' core_id='0' siblings='0-1'/> <cpu id='1' socket_id='0' core_id='0' siblings='0-1'/> <cpu id='2' socket_id='0' core_id='1' siblings='2-3'/> <cpu id='3' socket_id='0' core_id='1' siblings='2-3'/> <cpu id='4' socket_id='0' core_id='2' siblings='4-5'/> <cpu id='5' socket_id='0' core_id='2' siblings='4-5'/> <cpu id='6' socket_id='0' core_id='3' siblings='6-7'/> <cpu id='7' socket_id='0' core_id='3' siblings='6-7'/> </cpus> </cell> </cells> </topology> </host> <guest> <os_type>xen</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <machine>xenpv</machine> <domain type='xen'/> </arch> </guest> <guest> <os_type>xen</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <machine>xenpv</machine> <domain type='xen'/> </arch> <features> <pae/> </features> </guest> <guest> <os_type>hvm</os_type> <arch name='i686'> <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> <domain type='xen'/> </arch> <features> <pae/> <nonpae/> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> <hap default='on' toggle='yes'/> </features> </guest> <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <loader>/usr/lib/xen/boot/hvmloader</loader> <machine>xenfv</machine> <domain type='xen'/> </arch> <features> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> <hap default='on' toggle='yes'/> </features> </guest> </capabilities> >From arndale-lakeside, ARM. As left by 101251 | test-armhf-armhf-libvirt; osstest "branch" qemu-mainline <capabilities> <host> <cpu> <arch>armv7l</arch> </cpu> <power_management/> <netprefix>vif</netprefix> <topology> <cells num='1'> <cell id='0'> <memory unit='KiB'>2097152</memory> <cpus num='2'> <cpu id='0' socket_id='0' core_id='0' siblings='0-1'/> <cpu id='1' socket_id='0' core_id='0' siblings='0-1'/> </cpus> </cell> </cells> </topology> </host> <guest> <os_type>xen</os_type> <arch name='armv7l'> <wordsize>32</wordsize> <emulator>/usr/lib/xen/bin/qemu-system-i386</emulator> <machine>xenpv</machine> <domain type='xen'/> </arch> </guest> </capabilities>

4 14

[libvirt] Recommendations for Libvirt LTS release
by Guido Günther 11 Oct '16

11 Oct '16

Hi, Debian is about to enter it's freeze for the Stretch release in November and we will support the libvirt version that is in Stretch for at least 5 years. The upstream version of libvirt at this point will likely be 2.4.0. Are any other distros about to pick a version around that time so we can possibly join forces? Are there any recommendations to rather pick another version due to planned features/fixes/refactorings that haven't made it to the list yet? As with previous versions I will feed back patches to the -maint branch and hope to cut point releases as were currently doing with 0.9.12 but if other distros (apart from Debians downstreams) would use the same version this would be a plus. Cheers, -- Guido

3 2

[libvirt] [PATCH] audit: add descriptions about audit log
by Chen Hanxiao 11 Oct '16

11 Oct '16

From: Chen Hanxiao <chenhanxiao(a)gmail.com> This patch add some descriptions on what libvirt audit will record in introduction section. Signed-off-by: Chen Hanxiao <chenhanxiao(a)gmail.com> --- docs/auditlog.html.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/auditlog.html.in b/docs/auditlog.html.in index 45464af..d1d0f6e 100644 --- a/docs/auditlog.html.in +++ b/docs/auditlog.html.in @@ -14,7 +14,9 @@ subsystem. This provides administrators / auditors with a canonical historical record of changes to virtual machines' / containers' lifecycle states and their configuration. On hosts which are running the Linux audit daemon, - the logs will usually end up in <code>/var/log/audit/audit.log</code> + the logs will usually end up in <code>/var/log/audit/audit.log</code>. + If QEMU try to use some resources on the host, libvirt will record them + in audit log. </p> <h2><a name="config">Configuration</a></h2> -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] Sanitize vcpu topology checking
by Peter Krempa 11 Oct '16

11 Oct '16

See patch 1. Peter Krempa (2): conf: Sanitize cpu topology numbers qemu: Reuse virDomainDeGetVcpusTopology to calculate total vcpu count src/conf/domain_conf.c | 39 +++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 18 ++++++++---------- src/qemu/qemu_driver.c | 14 ++++++-------- 5 files changed, 56 insertions(+), 18 deletions(-) -- 2.10.0

2 3

[libvirt] libvirt-guest.sh bug fixes
by Stefan Bader 11 Oct '16

11 Oct '16

Two small changes, before I forget about submitting them... First one affects all environments the same. The list of UIDs which is generated has each element on a separate line. And using quotes in the echo preserves those newlines. However the processing assumes one line per URI and all UIDs separated by spaces. So without dropping the quotes only one guest will get shutdown/suspended. The second change is for Xen environments only. Domain-0 appears in the list of guests and it is a persistent one. So on shutdown, the script tries to stop Domain-0 (which is not working) and then waits the whole timeout for it to stop. -Stefan

4 11

[libvirt] [PATCH] libvirt-storage.c:Lines too long, use 80 character columns.
by Nitesh Konkar 11 Oct '16

11 Oct '16

Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- src/libvirt-storage.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/libvirt-storage.c b/src/libvirt-storage.c index 48996ba..c4f2a03 100644 --- a/src/libvirt-storage.c +++ b/src/libvirt-storage.c @@ -233,7 +233,8 @@ virConnectNumOfDefinedStoragePools(virConnectPtr conn) virCheckConnectReturn(conn, -1); - if (conn->storageDriver && conn->storageDriver->connectNumOfDefinedStoragePools) { + if (conn->storageDriver && + conn->storageDriver->connectNumOfDefinedStoragePools) { int ret; ret = conn->storageDriver->connectNumOfDefinedStoragePools(conn); if (ret < 0) @@ -280,7 +281,8 @@ virConnectListDefinedStoragePools(virConnectPtr conn, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (conn->storageDriver && conn->storageDriver->connectListDefinedStoragePools) { + if (conn->storageDriver && + conn->storageDriver->connectListDefinedStoragePools) { int ret; ret = conn->storageDriver->connectListDefinedStoragePools(conn, names, maxnames); if (ret < 0) @@ -332,7 +334,8 @@ virConnectFindStoragePoolSources(virConnectPtr conn, virCheckNonNullArgGoto(type, error); virCheckReadOnlyGoto(conn->flags, error); - if (conn->storageDriver && conn->storageDriver->connectFindStoragePoolSources) { + if (conn->storageDriver && + conn->storageDriver->connectFindStoragePoolSources) { char *ret; ret = conn->storageDriver->connectFindStoragePoolSources(conn, type, srcSpec, flags); if (!ret) @@ -485,7 +488,8 @@ virStoragePoolLookupByVolume(virStorageVolPtr vol) virCheckStorageVolReturn(vol, NULL); - if (vol->conn->storageDriver && vol->conn->storageDriver->storagePoolLookupByVolume) { + if (vol->conn->storageDriver && + vol->conn->storageDriver->storagePoolLookupByVolume) { virStoragePoolPtr ret; ret = vol->conn->storageDriver->storagePoolLookupByVolume(vol); if (!ret) @@ -1188,7 +1192,8 @@ virStoragePoolNumOfVolumes(virStoragePoolPtr pool) virCheckStoragePoolReturn(pool, -1); - if (pool->conn->storageDriver && pool->conn->storageDriver->storagePoolNumOfVolumes) { + if (pool->conn->storageDriver && + pool->conn->storageDriver->storagePoolNumOfVolumes) { int ret; ret = pool->conn->storageDriver->storagePoolNumOfVolumes(pool); if (ret < 0) @@ -1230,7 +1235,8 @@ virStoragePoolListVolumes(virStoragePoolPtr pool, virCheckNonNullArgGoto(names, error); virCheckNonNegativeArgGoto(maxnames, error); - if (pool->conn->storageDriver && pool->conn->storageDriver->storagePoolListVolumes) { + if (pool->conn->storageDriver && + pool->conn->storageDriver->storagePoolListVolumes) { int ret; ret = pool->conn->storageDriver->storagePoolListVolumes(pool, names, maxnames); if (ret < 0) @@ -1297,7 +1303,8 @@ virStorageVolLookupByName(virStoragePoolPtr pool, virCheckStoragePoolReturn(pool, NULL); virCheckNonNullArgGoto(name, error); - if (pool->conn->storageDriver && pool->conn->storageDriver->storageVolLookupByName) { + if (pool->conn->storageDriver && + pool->conn->storageDriver->storageVolLookupByName) { virStorageVolPtr ret; ret = pool->conn->storageDriver->storageVolLookupByName(pool, name); if (!ret) @@ -1471,7 +1478,8 @@ virStorageVolCreateXML(virStoragePoolPtr pool, virCheckNonNullArgGoto(xmlDesc, error); virCheckReadOnlyGoto(pool->conn->flags, error); - if (pool->conn->storageDriver && pool->conn->storageDriver->storageVolCreateXML) { + if (pool->conn->storageDriver && + pool->conn->storageDriver->storageVolCreateXML) { virStorageVolPtr ret; ret = pool->conn->storageDriver->storageVolCreateXML(pool, xmlDesc, flags); if (!ret) -- 2.1.0

3 3