|
 |
6ae9ed |
From ee944bdbf3422b4f6d0a4a2f7c7edc9b022a8bc2 Mon Sep 17 00:00:00 2001
|
|
|
6ae9ed |
Message-Id: <ee944bdbf3422b4f6d0a4a2f7c7edc9b022a8bc2@dist-git>
|
|
|
6ae9ed |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
6ae9ed |
Date: Tue, 2 Aug 2016 13:41:57 +0200
|
|
|
6ae9ed |
Subject: [PATCH] qemu: command: Rename qemuBuildNetworkDriveURI to
|
|
|
6ae9ed |
qemuBuildNetworkDriveStr
|
|
|
6ae9ed |
|
|
|
6ae9ed |
The function builds also non-uri strings for the various protocols.
|
|
|
6ae9ed |
|
|
|
6ae9ed |
(cherry picked from commit b8dc04a7742c2ebabf6922ac510389945ca0404b)
|
|
|
6ae9ed |
https://bugzilla.redhat.com/show_bug.cgi?id=1247521 [gluster multi-host]
|
|
|
6ae9ed |
---
|
|
|
6ae9ed |
src/qemu/qemu_command.c | 6 +++---
|
|
|
6ae9ed |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
6ae9ed |
|
|
|
6ae9ed |
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
|
6ae9ed |
index 9ac90f7..b691743 100644
|
|
|
6ae9ed |
--- a/src/qemu/qemu_command.c
|
|
|
6ae9ed |
+++ b/src/qemu/qemu_command.c
|
|
|
6ae9ed |
@@ -691,7 +691,7 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf,
|
|
|
6ae9ed |
#define QEMU_DEFAULT_NBD_PORT "10809"
|
|
|
6ae9ed |
|
|
|
6ae9ed |
static char *
|
|
|
6ae9ed |
-qemuBuildNetworkDriveURI(virStorageSourcePtr src,
|
|
|
6ae9ed |
+qemuBuildNetworkDriveStr(virStorageSourcePtr src,
|
|
|
6ae9ed |
qemuDomainSecretInfoPtr secinfo)
|
|
|
6ae9ed |
{
|
|
|
6ae9ed |
char *ret = NULL;
|
|
|
6ae9ed |
@@ -926,7 +926,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src,
|
|
|
6ae9ed |
break;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
case VIR_STORAGE_TYPE_NETWORK:
|
|
|
6ae9ed |
- if (!(*source = qemuBuildNetworkDriveURI(src, secinfo)))
|
|
|
6ae9ed |
+ if (!(*source = qemuBuildNetworkDriveStr(src, secinfo)))
|
|
|
6ae9ed |
goto cleanup;
|
|
|
6ae9ed |
break;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
@@ -4533,7 +4533,7 @@ qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDefPtr dev)
|
|
|
6ae9ed |
src.nhosts = iscsisrc->nhosts;
|
|
|
6ae9ed |
|
|
|
6ae9ed |
/* Rather than pull what we think we want - use the network disk code */
|
|
|
6ae9ed |
- source = qemuBuildNetworkDriveURI(&src, hostdevPriv->secinfo);
|
|
|
6ae9ed |
+ source = qemuBuildNetworkDriveStr(&src, hostdevPriv->secinfo);
|
|
|
6ae9ed |
|
|
|
6ae9ed |
return source;
|
|
|
6ae9ed |
}
|
|
|
6ae9ed |
--
|
|
|
6ae9ed |
2.9.2
|
|
|
6ae9ed |
|