From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 22 Jul 2016 08:01:04 +0000 (+0200)
Subject: qemu: command: Rename qemuBuildNetworkDriveURI to qemuBuildNetworkDriveStr
X-Git-Tag: v2.1.0-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8dc04a7742c2ebabf6922ac510389945ca0404b;p=thirdparty%2Flibvirt.git

qemu: command: Rename qemuBuildNetworkDriveURI to qemuBuildNetworkDriveStr

The function builds also non-uri strings for the various protocols.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5ac0725104..ae1bb34cd7 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -691,7 +691,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf,
 #define QEMU_DEFAULT_NBD_PORT "10809"
 
 static char *
-qemuBuildNetworkDriveURI(virStorageSourcePtr src,
+qemuBuildNetworkDriveStr(virStorageSourcePtr src,
                          qemuDomainSecretInfoPtr secinfo)
 {
     char *ret = NULL;
@@ -926,7 +926,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src,
         break;
 
     case VIR_STORAGE_TYPE_NETWORK:
-        if (!(*source = qemuBuildNetworkDriveURI(src, secinfo)))
+        if (!(*source = qemuBuildNetworkDriveStr(src, secinfo)))
             goto cleanup;
         break;
 
@@ -4534,7 +4534,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev)
     src.nhosts = iscsisrc->nhosts;
 
     /* Rather than pull what we think we want - use the network disk code */
-    source = qemuBuildNetworkDriveURI(&src, hostdevPriv->secinfo);
+    source = qemuBuildNetworkDriveStr(&src, hostdevPriv->secinfo);
 
     return source;
 }