External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: move network disk protocol type to util/

Browse Source 
Another enum moved to util/, this time the fallout from renaming
is not quite as large.

* src/conf/domain_conf.h (virDomainDiskProtocol): Move...
* src/util/virstoragefile.h (virStorageNetProtocol): ...and
rename.
* src/conf/domain_conf.c: Update clients.
* src/qemu/qemu_command.c: Likewise.
* src/qemu/qemu_conf.c: Likewise.
* src/qemu/qemu_driver.c: Likewise.
* src/qemu/qemu_migration.c: Likewise.
* src/storage/storage_backend.c: Likewise.
* src/storage/storage_backend_gluster.c: Likewise.
* src/libvirt_private.syms (domain_conf.h): Move symbols...
(virstoragefile.h): ...as appropriate.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-03-27 16:47:39 -06:00
parent 16ac4c9d64
commit 4220f76aed
11 changed files with 135 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/conf/domain_conf.c
View File

@ -257,18 +257,6 @@ VIR_ENUM_IMPL(virDomainDiskErrorPolicy, VIR_DOMAIN_DISK_ERROR_POLICY_LAST,
"ignore", "ignore",
"enospace") "enospace")
VIR_ENUM_IMPL(virDomainDiskProtocol, VIR_DOMAIN_DISK_PROTOCOL_LAST,
"nbd",
"rbd",
"sheepdog",
"gluster",
"iscsi",
"http",
"https",
"ftp",
"ftps",
"tftp")
VIR_ENUM_IMPL(virDomainDiskSecretType, VIR_DOMAIN_DISK_SECRET_TYPE_LAST, VIR_ENUM_IMPL(virDomainDiskSecretType, VIR_DOMAIN_DISK_SECRET_TYPE_LAST,
"none", "none",
"uuid", "uuid",
@ -5057,14 +5045,14 @@ virDomainDiskSourceDefParse(xmlNodePtr node,
goto cleanup; goto cleanup;
} }
if ((*proto = virDomainDiskProtocolTypeFromString(protocol)) < 0){ if ((*proto = virStorageNetProtocolTypeFromString(protocol)) < 0){
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown protocol type '%s'"), protocol); _("unknown protocol type '%s'"), protocol);
goto cleanup; goto cleanup;
} }
if (!(*source = virXMLPropString(node, "name")) && if (!(*source = virXMLPropString(node, "name")) &&
*proto != VIR_DOMAIN_DISK_PROTOCOL_NBD) { *proto != VIR_STORAGE_NET_PROTOCOL_NBD) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing name for disk source")); _("missing name for disk source"));
goto cleanup; goto cleanup;
@ -5255,9 +5243,9 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
goto error; goto error;
if (def->src.type == VIR_STORAGE_TYPE_NETWORK) { if (def->src.type == VIR_STORAGE_TYPE_NETWORK) {
if (def->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_ISCSI) if (def->src.protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)
expected_secret_usage = VIR_SECRET_USAGE_TYPE_ISCSI; expected_secret_usage = VIR_SECRET_USAGE_TYPE_ISCSI;
else if (def->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) else if (def->src.protocol == VIR_STORAGE_NET_PROTOCOL_RBD)
expected_secret_usage = VIR_SECRET_USAGE_TYPE_CEPH; expected_secret_usage = VIR_SECRET_USAGE_TYPE_CEPH;
} }
@ -14809,7 +14797,7 @@ virDomainDiskSourceDefFormatInternal(virBufferPtr buf,
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
virBufferAsprintf(buf, "<source protocol='%s'", virBufferAsprintf(buf, "<source protocol='%s'",
virDomainDiskProtocolTypeToString(protocol)); virStorageNetProtocolTypeToString(protocol));
virBufferEscapeString(buf, " name='%s'", src); virBufferEscapeString(buf, " name='%s'", src);
if (nhosts == 0) { if (nhosts == 0) {
@ -14984,9 +14972,9 @@ virDomainDiskDefFormat(virBufferPtr buf,
virBufferEscapeString(buf, "<auth username='%s'>\n", virBufferEscapeString(buf, "<auth username='%s'>\n",
def->src.auth.username); def->src.auth.username);
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
if (def->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_ISCSI) { if (def->src.protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI) {
virBufferAddLit(buf, "<secret type='iscsi'"); virBufferAddLit(buf, "<secret type='iscsi'");
} else if (def->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { } else if (def->src.protocol == VIR_STORAGE_NET_PROTOCOL_RBD) {
virBufferAddLit(buf, "<secret type='ceph'"); virBufferAddLit(buf, "<secret type='ceph'");
} }

17
src/conf/domain_conf.h
View File

@ -509,20 +509,6 @@ enum virDomainDiskErrorPolicy {
VIR_DOMAIN_DISK_ERROR_POLICY_LAST VIR_DOMAIN_DISK_ERROR_POLICY_LAST
}; };
enum virDomainDiskProtocol {
VIR_DOMAIN_DISK_PROTOCOL_NBD,
VIR_DOMAIN_DISK_PROTOCOL_RBD,
VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG,
VIR_DOMAIN_DISK_PROTOCOL_GLUSTER,
VIR_DOMAIN_DISK_PROTOCOL_ISCSI,
VIR_DOMAIN_DISK_PROTOCOL_HTTP,
VIR_DOMAIN_DISK_PROTOCOL_HTTPS,
VIR_DOMAIN_DISK_PROTOCOL_FTP,
VIR_DOMAIN_DISK_PROTOCOL_FTPS,
VIR_DOMAIN_DISK_PROTOCOL_TFTP,
VIR_DOMAIN_DISK_PROTOCOL_LAST
};
enum virDomainDiskTray { enum virDomainDiskTray {
VIR_DOMAIN_DISK_TRAY_CLOSED, VIR_DOMAIN_DISK_TRAY_CLOSED,
@ -656,7 +642,7 @@ typedef virDomainDiskSourceDef *virDomainDiskSourceDefPtr;
struct _virDomainDiskSourceDef { struct _virDomainDiskSourceDef {
int type; /* enum virStorageType */ int type; /* enum virStorageType */
char *path; char *path;
int protocol; /* enum virDomainDiskProtocol */ int protocol; /* enum virStorageNetProtocol */
size_t nhosts; size_t nhosts;
virStorageNetHostDefPtr hosts; virStorageNetHostDefPtr hosts;
virDomainDiskSourcePoolDefPtr srcpool; virDomainDiskSourcePoolDefPtr srcpool;
@ -2632,7 +2618,6 @@ VIR_ENUM_DECL(virDomainDiskGeometryTrans)
VIR_ENUM_DECL(virDomainDiskBus) VIR_ENUM_DECL(virDomainDiskBus)
VIR_ENUM_DECL(virDomainDiskCache) VIR_ENUM_DECL(virDomainDiskCache)
VIR_ENUM_DECL(virDomainDiskErrorPolicy) VIR_ENUM_DECL(virDomainDiskErrorPolicy)
VIR_ENUM_DECL(virDomainDiskProtocol)
VIR_ENUM_DECL(virDomainDiskIo) VIR_ENUM_DECL(virDomainDiskIo)
VIR_ENUM_DECL(virDomainDiskSecretType) VIR_ENUM_DECL(virDomainDiskSecretType)
VIR_ENUM_DECL(virDomainDeviceSGIO) VIR_ENUM_DECL(virDomainDeviceSGIO)

2
src/libvirt_private.syms
View File

@ -209,7 +209,6 @@ virDomainDiskInsertPreAlloced;
virDomainDiskIoTypeFromString; virDomainDiskIoTypeFromString;
virDomainDiskIoTypeToString; virDomainDiskIoTypeToString;
virDomainDiskPathByName; virDomainDiskPathByName;
virDomainDiskProtocolTypeToString;
virDomainDiskRemove; virDomainDiskRemove;
virDomainDiskRemoveByName; virDomainDiskRemoveByName;
virDomainDiskSetDriver; virDomainDiskSetDriver;
@ -1840,6 +1839,7 @@ virStorageNetHostDefCopy;
virStorageNetHostDefFree; virStorageNetHostDefFree;
virStorageNetHostTransportTypeFromString; virStorageNetHostTransportTypeFromString;
virStorageNetHostTransportTypeToString; virStorageNetHostTransportTypeToString;
virStorageNetProtocolTypeToString;
virStorageTypeFromString; virStorageTypeFromString;
virStorageTypeToString; virStorageTypeToString;

98
src/qemu/qemu_command.c
View File

@ -3573,35 +3573,35 @@ qemuNetworkDriveGetPort(int protocol,
return ret; return ret;
} }
switch ((enum virDomainDiskProtocol) protocol) { switch ((enum virStorageNetProtocol) protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTP:
return 80; return 80;
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_HTTPS:
return 443; return 443;
case VIR_DOMAIN_DISK_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTP:
return 21; return 21;
case VIR_DOMAIN_DISK_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_FTPS:
return 990; return 990;
case VIR_DOMAIN_DISK_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_TFTP:
return 69; return 69;
case VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
return 7000; return 7000;
case VIR_DOMAIN_DISK_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_NBD:
return 10809; return 10809;
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_ISCSI:
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
/* no default port specified */ /* no default port specified */
return 0; return 0;
case VIR_DOMAIN_DISK_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_RBD:
case VIR_DOMAIN_DISK_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_LAST:
/* not aplicable */ /* not aplicable */
return -1; return -1;
} }
@ -3624,12 +3624,12 @@ qemuBuildNetworkDriveURI(int protocol,
virURIPtr uri = NULL; virURIPtr uri = NULL;
size_t i; size_t i;
switch ((enum virDomainDiskProtocol) protocol) { switch ((enum virStorageNetProtocol) protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_NBD:
if (nhosts != 1) { if (nhosts != 1) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("protocol '%s' accepts only one host"), _("protocol '%s' accepts only one host"),
virDomainDiskProtocolTypeToString(protocol)); virStorageNetProtocolTypeToString(protocol));
goto cleanup; goto cleanup;
} }
@ -3682,17 +3682,17 @@ qemuBuildNetworkDriveURI(int protocol,
/* fallthrough */ /* fallthrough */
/* NBD code uses same formatting scheme as others in some cases */ /* NBD code uses same formatting scheme as others in some cases */
case VIR_DOMAIN_DISK_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTP:
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_HTTPS:
case VIR_DOMAIN_DISK_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTP:
case VIR_DOMAIN_DISK_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_FTPS:
case VIR_DOMAIN_DISK_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_TFTP:
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_ISCSI:
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
if (nhosts != 1) { if (nhosts != 1) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("protocol '%s' accepts only one host"), _("protocol '%s' accepts only one host"),
virDomainDiskProtocolTypeToString(protocol)); virStorageNetProtocolTypeToString(protocol));
goto cleanup; goto cleanup;
} }
@ -3701,11 +3701,11 @@ qemuBuildNetworkDriveURI(int protocol,
if (hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) { if (hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP) {
if (VIR_STRDUP(uri->scheme, if (VIR_STRDUP(uri->scheme,
virDomainDiskProtocolTypeToString(protocol)) < 0) virStorageNetProtocolTypeToString(protocol)) < 0)
goto cleanup; goto cleanup;
} else { } else {
if (virAsprintf(&uri->scheme, "%s+%s", if (virAsprintf(&uri->scheme, "%s+%s",
virDomainDiskProtocolTypeToString(protocol), virStorageNetProtocolTypeToString(protocol),
virStorageNetHostTransportTypeToString(hosts->transport)) < 0) virStorageNetHostTransportTypeToString(hosts->transport)) < 0)
goto cleanup; goto cleanup;
} }
@ -3740,7 +3740,7 @@ qemuBuildNetworkDriveURI(int protocol,
break; break;
case VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
if (!src) { if (!src) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing disk source for 'sheepdog' protocol")); _("missing disk source for 'sheepdog' protocol"));
@ -3764,7 +3764,7 @@ qemuBuildNetworkDriveURI(int protocol,
break; break;
case VIR_DOMAIN_DISK_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_RBD:
if (strchr(src, ':')) { if (strchr(src, ':')) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("':' not allowed in RBD source volume name '%s'"), _("':' not allowed in RBD source volume name '%s'"),
@ -3809,7 +3809,7 @@ qemuBuildNetworkDriveURI(int protocol,
break; break;
case VIR_DOMAIN_DISK_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_LAST:
goto cleanup; goto cleanup;
} }
@ -3876,19 +3876,19 @@ qemuDomainDiskGetSourceString(virConnectPtr conn,
if (actualType == VIR_STORAGE_TYPE_NETWORK && if (actualType == VIR_STORAGE_TYPE_NETWORK &&
disk->src.auth.username && disk->src.auth.username &&
(disk->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_ISCSI || (disk->src.protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI ||
disk->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD)) { disk->src.protocol == VIR_STORAGE_NET_PROTOCOL_RBD)) {
bool encode = false; bool encode = false;
int secretType = VIR_SECRET_USAGE_TYPE_ISCSI; int secretType = VIR_SECRET_USAGE_TYPE_ISCSI;
if (disk->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { if (disk->src.protocol == VIR_STORAGE_NET_PROTOCOL_RBD) {
/* qemu requires the secret to be encoded for RBD */ /* qemu requires the secret to be encoded for RBD */
encode = true; encode = true;
secretType = VIR_SECRET_USAGE_TYPE_CEPH; secretType = VIR_SECRET_USAGE_TYPE_CEPH;
} }
if (!(secret = qemuGetSecretString(conn, if (!(secret = qemuGetSecretString(conn,
virDomainDiskProtocolTypeToString(disk->src.protocol), virStorageNetProtocolTypeToString(disk->src.protocol),
encode, encode,
disk->src.auth.secretType, disk->src.auth.secretType,
disk->src.auth.username, disk->src.auth.username,
@ -4321,10 +4321,10 @@ qemuBuildDriveDevStr(virDomainDefPtr def,
goto error; goto error;
} }
if (disk->src.type == VIR_STORAGE_TYPE_NETWORK) { if (disk->src.type == VIR_STORAGE_TYPE_NETWORK) {
if (disk->src.protocol != VIR_DOMAIN_DISK_PROTOCOL_ISCSI) { if (disk->src.protocol != VIR_STORAGE_NET_PROTOCOL_ISCSI) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk device='lun' is not supported for protocol='%s'"), _("disk device='lun' is not supported for protocol='%s'"),
virDomainDiskProtocolTypeToString(disk->src.protocol)); virStorageNetProtocolTypeToString(disk->src.protocol));
goto error; goto error;
} }
} else if (!virDomainDiskSourceIsBlockType(disk)) { } else if (!virDomainDiskSourceIsBlockType(disk)) {
@ -10213,7 +10213,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
else if (STRPREFIX(def->src.path, "nbd:") || else if (STRPREFIX(def->src.path, "nbd:") ||
STRPREFIX(def->src.path, "nbd+")) { STRPREFIX(def->src.path, "nbd+")) {
def->src.type = VIR_STORAGE_TYPE_NETWORK; def->src.type = VIR_STORAGE_TYPE_NETWORK;
def->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_NBD; def->src.protocol = VIR_STORAGE_NET_PROTOCOL_NBD;
if (qemuParseNBDString(def) < 0) if (qemuParseNBDString(def) < 0)
goto error; goto error;
@ -10221,7 +10221,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
char *p = def->src.path; char *p = def->src.path;
def->src.type = VIR_STORAGE_TYPE_NETWORK; def->src.type = VIR_STORAGE_TYPE_NETWORK;
def->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_RBD; def->src.protocol = VIR_STORAGE_NET_PROTOCOL_RBD;
if (VIR_STRDUP(def->src.path, p + strlen("rbd:")) < 0) if (VIR_STRDUP(def->src.path, p + strlen("rbd:")) < 0)
goto error; goto error;
/* old-style CEPH_ARGS env variable is parsed later */ /* old-style CEPH_ARGS env variable is parsed later */
@ -10234,13 +10234,13 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
} else if (STRPREFIX(def->src.path, "gluster:") || } else if (STRPREFIX(def->src.path, "gluster:") ||
STRPREFIX(def->src.path, "gluster+")) { STRPREFIX(def->src.path, "gluster+")) {
def->src.type = VIR_STORAGE_TYPE_NETWORK; def->src.type = VIR_STORAGE_TYPE_NETWORK;
def->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_GLUSTER; def->src.protocol = VIR_STORAGE_NET_PROTOCOL_GLUSTER;
if (qemuParseGlusterString(def) < 0) if (qemuParseGlusterString(def) < 0)
goto error; goto error;
} else if (STRPREFIX(def->src.path, "iscsi:")) { } else if (STRPREFIX(def->src.path, "iscsi:")) {
def->src.type = VIR_STORAGE_TYPE_NETWORK; def->src.type = VIR_STORAGE_TYPE_NETWORK;
def->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; def->src.protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
if (qemuParseISCSIString(def) < 0) if (qemuParseISCSIString(def) < 0)
goto error; goto error;
@ -10249,7 +10249,7 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt,
char *port, *vdi; char *port, *vdi;
def->src.type = VIR_STORAGE_TYPE_NETWORK; def->src.type = VIR_STORAGE_TYPE_NETWORK;
def->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; def->src.protocol = VIR_STORAGE_NET_PROTOCOL_SHEEPDOG;
if (VIR_STRDUP(def->src.path, p + strlen("sheepdog:")) < 0) if (VIR_STRDUP(def->src.path, p + strlen("sheepdog:")) < 0)
goto error; goto error;
VIR_FREE(p); VIR_FREE(p);
@ -11505,17 +11505,17 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
disk->src.type = VIR_STORAGE_TYPE_BLOCK; disk->src.type = VIR_STORAGE_TYPE_BLOCK;
else if (STRPREFIX(val, "nbd:")) { else if (STRPREFIX(val, "nbd:")) {
disk->src.type = VIR_STORAGE_TYPE_NETWORK; disk->src.type = VIR_STORAGE_TYPE_NETWORK;
disk->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_NBD; disk->src.protocol = VIR_STORAGE_NET_PROTOCOL_NBD;
} else if (STRPREFIX(val, "rbd:")) { } else if (STRPREFIX(val, "rbd:")) {
disk->src.type = VIR_STORAGE_TYPE_NETWORK; disk->src.type = VIR_STORAGE_TYPE_NETWORK;
disk->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_RBD; disk->src.protocol = VIR_STORAGE_NET_PROTOCOL_RBD;
val += strlen("rbd:"); val += strlen("rbd:");
} else if (STRPREFIX(val, "gluster")) { } else if (STRPREFIX(val, "gluster")) {
disk->src.type = VIR_STORAGE_TYPE_NETWORK; disk->src.type = VIR_STORAGE_TYPE_NETWORK;
disk->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_GLUSTER; disk->src.protocol = VIR_STORAGE_NET_PROTOCOL_GLUSTER;
} else if (STRPREFIX(val, "sheepdog:")) { } else if (STRPREFIX(val, "sheepdog:")) {
disk->src.type = VIR_STORAGE_TYPE_NETWORK; disk->src.type = VIR_STORAGE_TYPE_NETWORK;
disk->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; disk->src.protocol = VIR_STORAGE_NET_PROTOCOL_SHEEPDOG;
val += strlen("sheepdog:"); val += strlen("sheepdog:");
} else } else
disk->src.type = VIR_STORAGE_TYPE_FILE; disk->src.type = VIR_STORAGE_TYPE_FILE;
@ -11551,16 +11551,16 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
char *port; char *port;
switch (disk->src.protocol) { switch (disk->src.protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_NBD:
if (qemuParseNBDString(disk) < 0) if (qemuParseNBDString(disk) < 0)
goto error; goto error;
break; break;
case VIR_DOMAIN_DISK_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_RBD:
/* old-style CEPH_ARGS env variable is parsed later */ /* old-style CEPH_ARGS env variable is parsed later */
if (!ceph_args && qemuParseRBDString(disk) < 0) if (!ceph_args && qemuParseRBDString(disk) < 0)
goto error; goto error;
break; break;
case VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
/* disk->src must be [vdiname] or [host]:[port]:[vdiname] */ /* disk->src must be [vdiname] or [host]:[port]:[vdiname] */
port = strchr(disk->src.path, ':'); port = strchr(disk->src.path, ':');
if (port) { if (port) {
@ -11584,12 +11584,12 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
goto error; goto error;
} }
break; break;
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
if (qemuParseGlusterString(disk) < 0) if (qemuParseGlusterString(disk) < 0)
goto error; goto error;
break; break;
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_ISCSI:
if (qemuParseISCSIString(disk) < 0) if (qemuParseISCSIString(disk) < 0)
goto error; goto error;
@ -12028,7 +12028,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
virDomainDiskDefPtr first_rbd_disk = NULL; virDomainDiskDefPtr first_rbd_disk = NULL;
for (i = 0; i < def->ndisks; i++) { for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->src.type == VIR_STORAGE_TYPE_NETWORK && if (def->disks[i]->src.type == VIR_STORAGE_TYPE_NETWORK &&
def->disks[i]->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { def->disks[i]->src.protocol == VIR_STORAGE_NET_PROTOCOL_RBD) {
first_rbd_disk = def->disks[i]; first_rbd_disk = def->disks[i];
break; break;
} }

4
src/qemu/qemu_conf.c
View File

@ -1195,7 +1195,7 @@ qemuAddISCSIPoolSourceHost(virDomainDiskDefPtr def,
def->src.hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP; def->src.hosts[0].transport = VIR_STORAGE_NET_HOST_TRANS_TCP;
def->src.hosts[0].socket = NULL; def->src.hosts[0].socket = NULL;
def->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; def->src.protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
ret = 0; ret = 0;
@ -1376,7 +1376,7 @@ qemuTranslateDiskSourcePool(virConnectPtr conn,
case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT: case VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT:
def->src.srcpool->actualtype = VIR_STORAGE_TYPE_NETWORK; def->src.srcpool->actualtype = VIR_STORAGE_TYPE_NETWORK;
def->src.protocol = VIR_DOMAIN_DISK_PROTOCOL_ISCSI; def->src.protocol = VIR_STORAGE_NET_PROTOCOL_ISCSI;
if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0) if (qemuTranslateDiskSourcePoolAuth(def, pooldef) < 0)
goto cleanup; goto cleanup;

86
src/qemu/qemu_driver.c
View File

@ -12356,22 +12356,22 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk)
return 0; return 0;
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
switch ((enum virDomainDiskProtocol) disk->src.protocol) { switch ((enum virStorageNetProtocol) disk->src.protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_NBD:
case VIR_DOMAIN_DISK_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_RBD:
case VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_ISCSI:
case VIR_DOMAIN_DISK_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTP:
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_HTTPS:
case VIR_DOMAIN_DISK_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTP:
case VIR_DOMAIN_DISK_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_FTPS:
case VIR_DOMAIN_DISK_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_TFTP:
case VIR_DOMAIN_DISK_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("external inactive snapshots are not supported on " _("external inactive snapshots are not supported on "
"'network' disks using '%s' protocol"), "'network' disks using '%s' protocol"),
virDomainDiskProtocolTypeToString(disk->src.protocol)); virStorageNetProtocolTypeToString(disk->src.protocol));
return -1; return -1;
} }
break; break;
@ -12417,24 +12417,24 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d
return 0; return 0;
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
switch ((enum virDomainDiskProtocol) disk->protocol) { switch ((enum virStorageNetProtocol) disk->protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
return 0; return 0;
case VIR_DOMAIN_DISK_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_NBD:
case VIR_DOMAIN_DISK_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_RBD:
case VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_ISCSI:
case VIR_DOMAIN_DISK_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTP:
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_HTTPS:
case VIR_DOMAIN_DISK_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTP:
case VIR_DOMAIN_DISK_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_FTPS:
case VIR_DOMAIN_DISK_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_TFTP:
case VIR_DOMAIN_DISK_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("external active snapshots are not supported on " _("external active snapshots are not supported on "
"'network' disks using '%s' protocol"), "'network' disks using '%s' protocol"),
virDomainDiskProtocolTypeToString(disk->protocol)); virStorageNetProtocolTypeToString(disk->protocol));
return -1; return -1;
} }
@ -12561,22 +12561,22 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn,
return 0; return 0;
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
switch ((enum virDomainDiskProtocol) disk->src.protocol) { switch ((enum virStorageNetProtocol) disk->src.protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_NBD: case VIR_STORAGE_NET_PROTOCOL_NBD:
case VIR_DOMAIN_DISK_PROTOCOL_RBD: case VIR_STORAGE_NET_PROTOCOL_RBD:
case VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG: case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
case VIR_DOMAIN_DISK_PROTOCOL_ISCSI: case VIR_STORAGE_NET_PROTOCOL_ISCSI:
case VIR_DOMAIN_DISK_PROTOCOL_HTTP: case VIR_STORAGE_NET_PROTOCOL_HTTP:
case VIR_DOMAIN_DISK_PROTOCOL_HTTPS: case VIR_STORAGE_NET_PROTOCOL_HTTPS:
case VIR_DOMAIN_DISK_PROTOCOL_FTP: case VIR_STORAGE_NET_PROTOCOL_FTP:
case VIR_DOMAIN_DISK_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_FTPS:
case VIR_DOMAIN_DISK_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_TFTP:
case VIR_DOMAIN_DISK_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("internal inactive snapshots are not supported on " _("internal inactive snapshots are not supported on "
"'network' disks using '%s' protocol"), "'network' disks using '%s' protocol"),
virDomainDiskProtocolTypeToString(disk->src.protocol)); virStorageNetProtocolTypeToString(disk->src.protocol));
return -1; return -1;
} }
break; break;
@ -12637,8 +12637,8 @@ qemuDomainSnapshotPrepare(virConnectPtr conn,
goto cleanup; goto cleanup;
if (dom_disk->src.type == VIR_STORAGE_TYPE_NETWORK && if (dom_disk->src.type == VIR_STORAGE_TYPE_NETWORK &&
(dom_disk->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG || (dom_disk->src.protocol == VIR_STORAGE_NET_PROTOCOL_SHEEPDOG ||
dom_disk->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD)) { dom_disk->src.protocol == VIR_STORAGE_NET_PROTOCOL_RBD)) {
break; break;
} }
if (vm->def->disks[i]->src.format > 0 && if (vm->def->disks[i]->src.format > 0 &&
@ -12814,7 +12814,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
switch (snap->protocol) { switch (snap->protocol) {
case VIR_DOMAIN_DISK_PROTOCOL_GLUSTER: case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
if (!(newhosts = virStorageNetHostDefCopy(snap->nhosts, snap->hosts))) if (!(newhosts = virStorageNetHostDefCopy(snap->nhosts, snap->hosts)))
goto cleanup; goto cleanup;
@ -12828,7 +12828,7 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver,
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("snapshots on volumes using '%s' protocol " _("snapshots on volumes using '%s' protocol "
"are not supported"), "are not supported"),
virDomainDiskProtocolTypeToString(snap->protocol)); virStorageNetProtocolTypeToString(snap->protocol));
goto cleanup; goto cleanup;
} }
break; break;

2
src/qemu/qemu_migration.c
View File

@ -1543,7 +1543,7 @@ qemuMigrationIsSafe(virDomainDefPtr def)
else if (rc == 1) else if (rc == 1)
continue; continue;
} else if (disk->src.type == VIR_STORAGE_TYPE_NETWORK && } else if (disk->src.type == VIR_STORAGE_TYPE_NETWORK &&
disk->src.protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD) { disk->src.protocol == VIR_STORAGE_NET_PROTOCOL_RBD) {
continue; continue;
} }

2
src/storage/storage_backend.c
View File

@ -1187,7 +1187,7 @@ virStorageFileBackendForType(int type,
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("missing storage backend for network files " _("missing storage backend for network files "
"using %s protocol"), "using %s protocol"),
virDomainDiskProtocolTypeToString(protocol)); virStorageNetProtocolTypeToString(protocol));
} else { } else {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("missing storage backend for '%s' storage"), _("missing storage backend for '%s' storage"),

2
src/storage/storage_backend_gluster.c
View File

@ -669,7 +669,7 @@ virStorageFileBackendGlusterStat(virStorageFilePtr file,
virStorageFileBackend virStorageFileBackendGluster = { virStorageFileBackend virStorageFileBackendGluster = {
.type = VIR_STORAGE_TYPE_NETWORK, .type = VIR_STORAGE_TYPE_NETWORK,
.protocol = VIR_DOMAIN_DISK_PROTOCOL_GLUSTER, .protocol = VIR_STORAGE_NET_PROTOCOL_GLUSTER,
.backendInit = virStorageFileBackendGlusterInit, .backendInit = virStorageFileBackendGlusterInit,
.backendDeinit = virStorageFileBackendGlusterDeinit, .backendDeinit = virStorageFileBackendGlusterDeinit,

11
src/util/virstoragefile.c
View File

@ -73,6 +73,17 @@ VIR_ENUM_IMPL(virStorageFileFeature,
"lazy_refcounts", "lazy_refcounts",
) )
VIR_ENUM_IMPL(virStorageNetProtocol, VIR_STORAGE_NET_PROTOCOL_LAST,
"nbd",
"rbd",
"sheepdog",
"gluster",
"iscsi",
"http",
"https",
"ftp",
"ftps",
"tftp")
VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST, VIR_ENUM_IMPL(virStorageNetHostTransport, VIR_STORAGE_NET_HOST_TRANS_LAST,
"tcp", "tcp",

18
src/util/virstoragefile.h
View File

@ -100,6 +100,24 @@ struct _virStorageFileMetadata {
/* Information related to network storage */ /* Information related to network storage */
enum virStorageNetProtocol {
VIR_STORAGE_NET_PROTOCOL_NBD,
VIR_STORAGE_NET_PROTOCOL_RBD,
VIR_STORAGE_NET_PROTOCOL_SHEEPDOG,
VIR_STORAGE_NET_PROTOCOL_GLUSTER,
VIR_STORAGE_NET_PROTOCOL_ISCSI,
VIR_STORAGE_NET_PROTOCOL_HTTP,
VIR_STORAGE_NET_PROTOCOL_HTTPS,
VIR_STORAGE_NET_PROTOCOL_FTP,
VIR_STORAGE_NET_PROTOCOL_FTPS,
VIR_STORAGE_NET_PROTOCOL_TFTP,
VIR_STORAGE_NET_PROTOCOL_LAST
};
VIR_ENUM_DECL(virStorageNetProtocol)
enum virStorageNetHostTransport { enum virStorageNetHostTransport {
VIR_STORAGE_NET_HOST_TRANS_TCP, VIR_STORAGE_NET_HOST_TRANS_TCP,
VIR_STORAGE_NET_HOST_TRANS_UNIX, VIR_STORAGE_NET_HOST_TRANS_UNIX,