External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-23 13:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Remove default port numbers for NBD and GLUSTER

Browse Source 
The command line generators for the protocols above hardcoded a default
port number. Since we now always assign it when parsing the source
definition, this ad-hoc code is not required any more.
This commit is contained in:
Peter Krempa 2017-07-07 16:11:56 +02:00
parent 9756884d14
commit 5f24220244
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_command.c
View File

@ -792,9 +792,6 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd,
}
#define QEMU_DEFAULT_NBD_PORT "10809"
#define QEMU_DEFAULT_GLUSTER_PORT "24007"
/* builds the hosts array */
static virJSONValuePtr
qemuBuildGlusterDriveJSONHosts(virStorageSourcePtr src)
@ -804,7 +801,6 @@ qemuBuildGlusterDriveJSONHosts(virStorageSourcePtr src)
virJSONValuePtr ret = NULL;
virStorageNetHostDefPtr host;
const char *transport;
const char *portstr;
size_t i;
if (!(servers = virJSONValueNewArray()))
@ -813,19 +809,15 @@ qemuBuildGlusterDriveJSONHosts(virStorageSourcePtr src)
for (i = 0; i < src->nhosts; i++) {
host = src->hosts + i;
transport = virStorageNetHostTransportTypeToString(host->transport);
portstr = host->port;
if (virJSONValueObjectCreate(&server, "s:type", transport, NULL) < 0)
goto cleanup;
if (!portstr)
portstr = QEMU_DEFAULT_GLUSTER_PORT;
switch ((virStorageNetHostTransport) host->transport) {
case VIR_STORAGE_NET_HOST_TRANS_TCP:
if (virJSONValueObjectAdd(server,
"s:host", host->name,
"s:port", portstr,
"s:port", host->port,
NULL) < 0)
goto cleanup;
break;
@ -979,10 +971,8 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src,
switch (src->hosts->transport) {
case VIR_STORAGE_NET_HOST_TRANS_TCP:
virBufferStrcat(&buf, src->hosts->name, NULL);
virBufferAsprintf(&buf, ":%s",
src->hosts->port ? src->hosts->port :
QEMU_DEFAULT_NBD_PORT);
virBufferStrcat(&buf, src->hosts->name, ":",
src->hosts->port, NULL);
break;
case VIR_STORAGE_NET_HOST_TRANS_UNIX: