[libvirt] [PATCH 18/25] qemu: command: Rename qemuBuildNetworkDriveURI to qemuBuildNetworkDriveStr

Peter Krempa pkrempa at redhat.com
Mon Jul 25 18:12:03 UTC 2016


The function builds also non-uri strings for the various protocols.
---
 src/qemu/qemu_command.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3d6e4b5..96cc202 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;
 }
-- 
2.9.0




More information about the libvir-list mailing list