External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Use qemuBuildNetworkDriveURI to handle http/ftp and friends

Browse Source 
Prepare the function to integrate other protocols and start folding
other network protocols into a common place.
This commit is contained in:
Peter Krempa 2013-11-18 17:12:59 +01:00
parent 927ddae197
commit 078a102537
1 changed files with 127 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/qemu/qemu_command.c
View File

@ -3627,6 +3627,61 @@ error:
}
static int
qemuNetworkDriveGetPort(int protocol,
const char *port)
{
int ret = 0;
if (port) {
if (virStrToLong_i(port, NULL, 10, &ret) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to parse port number '%s'"),
port);
return -1;
}
return ret;
}
switch ((enum virDomainDiskProtocol) protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_HTTP:
return 80;
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS:
return 443;
case VIR_DOMAIN_DISK_PROTOCOL_FTP:
return 21;
case VIR_DOMAIN_DISK_PROTOCOL_FTPS:
return 990;
case VIR_DOMAIN_DISK_PROTOCOL_TFTP:
return 69;
case VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG:
return 7000;
case VIR_DOMAIN_DISK_PROTOCOL_NBD:
return 10809;
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI:
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER:
/* no default port specified */
return 0;
case VIR_DOMAIN_DISK_PROTOCOL_RBD:
case VIR_DOMAIN_DISK_PROTOCOL_LAST:
/* not aplicable */
return -1;
}
return -1;
}
char *
qemuBuildNetworkDriveURI(int protocol,
const char *src,
@ -3638,18 +3693,28 @@ qemuBuildNetworkDriveURI(int protocol,
char *ret = NULL;
virURIPtr uri = NULL;
switch ((enum virDomainDiskProtocol) protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_HTTP:
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS:
case VIR_DOMAIN_DISK_PROTOCOL_FTP:
case VIR_DOMAIN_DISK_PROTOCOL_FTPS:
case VIR_DOMAIN_DISK_PROTOCOL_TFTP:
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI:
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER:
case VIR_DOMAIN_DISK_PROTOCOL_NBD:
if (nhosts != 1) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("protocol '%s' accepts only one host"),
virDomainDiskProtocolTypeToString(protocol));
return NULL;
goto cleanup;
}
if (VIR_ALLOC(uri) < 0)
return NULL;
goto cleanup;
if (hosts->transport == VIR_DOMAIN_DISK_PROTO_TRANS_TCP) {
if (VIR_STRDUP(uri->scheme, virDomainDiskProtocolTypeToString(protocol)) < 0)
if (VIR_STRDUP(uri->scheme,
virDomainDiskProtocolTypeToString(protocol)) < 0)
goto cleanup;
} else {
if (virAsprintf(&uri->scheme, "%s+%s",
@ -3658,17 +3723,14 @@ qemuBuildNetworkDriveURI(int protocol,
goto cleanup;
}
if (src &&
virAsprintf(&uri->path, "/%s", src) < 0)
if ((uri->port = qemuNetworkDriveGetPort(protocol, hosts->port)) < 0)
goto cleanup;
if (hosts->port &&
virStrToLong_i(hosts->port, NULL, 10, &uri->port) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to parse port number '%s'"),
hosts->port);
if (src &&
virAsprintf(&uri->path, "%s%s",
src[0] == '/' ? "" : "/",
src) < 0)
goto cleanup;
}
if (hosts->socket &&
virAsprintf(&uri->query, "socket=%s", hosts->socket) < 0)
@ -3689,6 +3751,17 @@ qemuBuildNetworkDriveURI(int protocol,
ret = virURIFormat(uri);
break;
case VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG:
case VIR_DOMAIN_DISK_PROTOCOL_RBD:
case VIR_DOMAIN_DISK_PROTOCOL_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("network disk protocol '%s' not supported"),
virDomainDiskProtocolTypeToString(protocol));
goto cleanup;
}
cleanup:
virURIFree(uri);
@ -3756,11 +3829,9 @@ qemuBuildNBDString(virConnectPtr conn, virDomainDiskDefPtr disk, virBufferPtr op
return -1;
}
if ((disk->hosts->name && strchr(disk->hosts->name, ':'))
|| (disk->hosts->transport == VIR_DOMAIN_DISK_PROTO_TRANS_TCP
&& !disk->hosts->name)
|| (disk->hosts->transport == VIR_DOMAIN_DISK_PROTO_TRANS_UNIX
&& disk->hosts->socket && disk->hosts->socket[0] != '/'))
if ((disk->hosts->name && strchr(disk->hosts->name, ':')) ||
(disk->hosts->transport == VIR_DOMAIN_DISK_PROTO_TRANS_TCP && !disk->hosts->name) ||
(disk->hosts->transport == VIR_DOMAIN_DISK_PROTO_TRANS_UNIX && disk->hosts->socket && disk->hosts->socket[0] != '/'))
return qemuBuildDriveURIString(conn, disk, opt);
virBufferAddLit(opt, "file=nbd:");
@ -3930,6 +4001,11 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED,
virBufferAddChar(&opt, ',');
break;
case VIR_DOMAIN_DISK_PROTOCOL_TFTP:
case VIR_DOMAIN_DISK_PROTOCOL_FTPS:
case VIR_DOMAIN_DISK_PROTOCOL_FTP:
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS:
case VIR_DOMAIN_DISK_PROTOCOL_HTTP:
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER:
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI:
if (qemuBuildDriveURIString(conn, disk, &opt) < 0)
@ -3948,37 +4024,6 @@ qemuBuildDriveStr(virConnectPtr conn ATTRIBUTE_UNUSED,
virBufferEscape(&opt, ',', ",", "%s,", disk->src);
}
break;
case VIR_DOMAIN_DISK_PROTOCOL_HTTP:
virBufferAsprintf(&opt, "file=http://%s:%s",
disk->hosts->name,
disk->hosts->port ? disk->hosts->port : "80");
virBufferEscape(&opt, ',', ",", "%s,", disk->src);
break;
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS:
virBufferAsprintf(&opt, "file=https://%s:%s",
disk->hosts->name,
disk->hosts->port ? disk->hosts->port : "443");
virBufferEscape(&opt, ',', ",", "%s,", disk->src);
break;
case VIR_DOMAIN_DISK_PROTOCOL_FTP:
virBufferAsprintf(&opt, "file=ftp://%s:%s",
disk->hosts->name,
disk->hosts->port ? disk->hosts->port : "21");
virBufferEscape(&opt, ',', ",", "%s,", disk->src);
break;
case VIR_DOMAIN_DISK_PROTOCOL_FTPS:
virBufferAsprintf(&opt, "file=ftps://%s:%s",
disk->hosts->name,
disk->hosts->port ? disk->hosts->port : "990");
virBufferEscape(&opt, ',', ",", "%s,", disk->src);
break;
case VIR_DOMAIN_DISK_PROTOCOL_TFTP:
virBufferAsprintf(&opt, "file=tftp://%s:%s",
disk->hosts->name,
disk->hosts->port ? disk->hosts->port : "69");
virBufferEscape(&opt, ',', ",", "%s,", disk->src);
break;
}
} else {
if ((actualType == VIR_DOMAIN_DISK_TYPE_BLOCK) &&