openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

conf: manage disk source by struct instead of pieces 

Now that we have a dedicated type for representing a disk source,
we might as well parse and format directly into that type instead
of piecemeal into pointers to members of the type.

* src/conf/domain_conf.h (virDomainDiskSourceDefFormatInternal)
(virDomainDiskSourceDefParse): Rename...
(virDomainDiskSourceFormat, virDomainDiskSourceParse): ...and
compress signatures.
* src/conf/domain_conf.c (virDomainDiskSourceParse)
(virDomainDiskSourceFormat): Rewrite to use common struct.
(virDomainDiskSourceDefFormat): Delete.
(virDomainDiskDefParseXML, virDomainDiskDefFormat): Update
callers.
* src/conf/snapshot_conf.c (virDomainSnapshotDiskDefParseXML)
(virDomainSnapshotDiskDefFormat): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-03-31 12:07:04 -06:00
parent 93d4585e75
commit c99efbcd2a
3 changed files with 62 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/conf/domain_conf.c
View File

@ -4954,13 +4954,8 @@ virDomainDiskSourcePoolDefParse(xmlNodePtr node,
int int
virDomainDiskSourceDefParse(xmlNodePtr node, virDomainDiskSourceParse(xmlNodePtr node,
int type, virStorageSourcePtr src)
char **source,
int *proto,
size_t *nhosts,
virStorageNetHostDefPtr *hosts,
virStorageSourcePoolDefPtr *srcpool)
{ {
char *protocol = NULL; char *protocol = NULL;
char *transport = NULL; char *transport = NULL;
@ -4970,15 +4965,15 @@ virDomainDiskSourceDefParse(xmlNodePtr node,
memset(&host, 0, sizeof(host)); memset(&host, 0, sizeof(host));
switch (type) { switch (src->type) {
case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_FILE:
*source = virXMLPropString(node, "file"); src->path = virXMLPropString(node, "file");
break; break;
case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_BLOCK:
*source = virXMLPropString(node, "dev"); src->path = virXMLPropString(node, "dev");
break; break;
case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_DIR:
*source = virXMLPropString(node, "dir"); src->path = virXMLPropString(node, "dir");
break; break;
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
if (!(protocol = virXMLPropString(node, "protocol"))) { if (!(protocol = virXMLPropString(node, "protocol"))) {
@ -4987,14 +4982,14 @@ virDomainDiskSourceDefParse(xmlNodePtr node,
goto cleanup; goto cleanup;
} }
if ((*proto = virStorageNetProtocolTypeFromString(protocol)) < 0){ if ((src->protocol = 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 (!(src->path = virXMLPropString(node, "name")) &&
*proto != VIR_STORAGE_NET_PROTOCOL_NBD) { src->protocol != 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;
@ -5048,28 +5043,28 @@ virDomainDiskSourceDefParse(xmlNodePtr node,
host.port = virXMLPropString(child, "port"); host.port = virXMLPropString(child, "port");
} }
if (VIR_APPEND_ELEMENT(*hosts, *nhosts, host) < 0) if (VIR_APPEND_ELEMENT(src->hosts, src->nhosts, host) < 0)
goto cleanup; goto cleanup;
} }
child = child->next; child = child->next;
} }
break; break;
case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_VOLUME:
if (virDomainDiskSourcePoolDefParse(node, srcpool) < 0) if (virDomainDiskSourcePoolDefParse(node, &src->srcpool) < 0)
goto cleanup; goto cleanup;
break; break;
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected disk type %s"), _("unexpected disk type %s"),
virStorageTypeToString(type)); virStorageTypeToString(src->type));
goto cleanup; goto cleanup;
} }
/* People sometimes pass a bogus '' source path when they mean to omit the /* People sometimes pass a bogus '' source path when they mean to omit the
* source element completely (e.g. CDROM without media). This is just a * source element completely (e.g. CDROM without media). This is just a
* little compatibility check to help those broken apps */ * little compatibility check to help those broken apps */
if (*source && STREQ(*source, "")) if (src->path && !*src->path)
VIR_FREE(*source); VIR_FREE(src->path);
ret = 0; ret = 0;
@ -5107,7 +5102,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
char *sgio = NULL; char *sgio = NULL;
char *driverName = NULL; char *driverName = NULL;
char *driverType = NULL; char *driverType = NULL;
char *source = NULL; const char *source = NULL;
char *target = NULL; char *target = NULL;
char *trans = NULL; char *trans = NULL;
char *bus = NULL; char *bus = NULL;
@ -5176,13 +5171,9 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
xmlStrEqual(cur->name, BAD_CAST "source")) { xmlStrEqual(cur->name, BAD_CAST "source")) {
sourceNode = cur; sourceNode = cur;
if (virDomainDiskSourceDefParse(cur, def->src.type, if (virDomainDiskSourceParse(cur, &def->src) < 0)
&source,
&def->src.protocol,
&def->src.nhosts,
&def->src.hosts,
&def->src.srcpool) < 0)
goto error; goto error;
source = def->src.path;
if (def->src.type == VIR_STORAGE_TYPE_NETWORK) { if (def->src.type == VIR_STORAGE_TYPE_NETWORK) {
if (def->src.protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI) if (def->src.protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)
@ -5799,8 +5790,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
def->startupPolicy = val; def->startupPolicy = val;
} }
def->src.path = source;
source = NULL;
def->dst = target; def->dst = target;
target = NULL; target = NULL;
def->src.auth.username = authUsername; def->src.auth.username = authUsername;
@ -5852,7 +5841,6 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
VIR_FREE(rawio); VIR_FREE(rawio);
VIR_FREE(sgio); VIR_FREE(sgio);
VIR_FREE(target); VIR_FREE(target);
VIR_FREE(source);
VIR_FREE(tray); VIR_FREE(tray);
VIR_FREE(removable); VIR_FREE(removable);
VIR_FREE(trans); VIR_FREE(trans);
@ -14694,16 +14682,9 @@ virDomainDiskSourceDefFormatSeclabel(virBufferPtr buf,
} }
int int
virDomainDiskSourceDefFormatInternal(virBufferPtr buf, virDomainDiskSourceFormat(virBufferPtr buf,
int type, virStorageSourcePtr src,
const char *src,
int policy, int policy,
int protocol,
size_t nhosts,
virStorageNetHostDefPtr hosts,
size_t nseclabels,
virSecurityDeviceLabelDefPtr *seclabels,
virStorageSourcePoolDefPtr srcpool,
unsigned int flags) unsigned int flags)
{ {
size_t n; size_t n;
@ -14712,51 +14693,56 @@ virDomainDiskSourceDefFormatInternal(virBufferPtr buf,
if (policy) if (policy)
startupPolicy = virDomainStartupPolicyTypeToString(policy); startupPolicy = virDomainStartupPolicyTypeToString(policy);
if (src || nhosts > 0 || srcpool || startupPolicy) { if (src->path || src->nhosts > 0 || src->srcpool || startupPolicy) {
switch (type) { switch ((enum virStorageType)src->type) {
case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_FILE:
virBufferAddLit(buf, "<source"); virBufferAddLit(buf, "<source");
virBufferEscapeString(buf, " file='%s'", src); virBufferEscapeString(buf, " file='%s'", src->path);
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy); virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy);
virDomainDiskSourceDefFormatSeclabel(buf, nseclabels, seclabels, flags); virDomainDiskSourceDefFormatSeclabel(buf, src->nseclabels,
src->seclabels, flags);
break; break;
case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_BLOCK:
virBufferAddLit(buf, "<source"); virBufferAddLit(buf, "<source");
virBufferEscapeString(buf, " dev='%s'", src); virBufferEscapeString(buf, " dev='%s'", src->path);
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy); virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy);
virDomainDiskSourceDefFormatSeclabel(buf, nseclabels, seclabels, flags); virDomainDiskSourceDefFormatSeclabel(buf, src->nseclabels,
src->seclabels, flags);
break; break;
case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_DIR:
virBufferAddLit(buf, "<source"); virBufferAddLit(buf, "<source");
virBufferEscapeString(buf, " dir='%s'", src); virBufferEscapeString(buf, " dir='%s'", src->path);
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy); virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy);
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
break; break;
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
virBufferAsprintf(buf, "<source protocol='%s'", virBufferAsprintf(buf, "<source protocol='%s'",
virStorageNetProtocolTypeToString(protocol)); virStorageNetProtocolTypeToString(src->protocol));
virBufferEscapeString(buf, " name='%s'", src); virBufferEscapeString(buf, " name='%s'", src->path);
if (nhosts == 0) { if (src->nhosts == 0) {
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} else { } else {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2); virBufferAdjustIndent(buf, 2);
for (n = 0; n < nhosts; n++) { for (n = 0; n < src->nhosts; n++) {
virBufferAddLit(buf, "<host"); virBufferAddLit(buf, "<host");
virBufferEscapeString(buf, " name='%s'", hosts[n].name); virBufferEscapeString(buf, " name='%s'",
virBufferEscapeString(buf, " port='%s'", hosts[n].port); src->hosts[n].name);
virBufferEscapeString(buf, " port='%s'",
src->hosts[n].port);
if (hosts[n].transport) if (src->hosts[n].transport)
virBufferAsprintf(buf, " transport='%s'", virBufferAsprintf(buf, " transport='%s'",
virStorageNetHostTransportTypeToString(hosts[n].transport)); virStorageNetHostTransportTypeToString(src->hosts[n].transport));
virBufferEscapeString(buf, " socket='%s'", hosts[n].socket); virBufferEscapeString(buf, " socket='%s'",
src->hosts[n].socket);
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
@ -14768,22 +14754,23 @@ virDomainDiskSourceDefFormatInternal(virBufferPtr buf,
case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_VOLUME:
virBufferAddLit(buf, "<source"); virBufferAddLit(buf, "<source");
if (srcpool) { if (src->srcpool) {
virBufferAsprintf(buf, " pool='%s' volume='%s'", virBufferEscapeString(buf, " pool='%s'", src->srcpool->pool);
srcpool->pool, srcpool->volume); virBufferEscapeString(buf, " volume='%s'",
if (srcpool->mode) src->srcpool->volume);
if (src->srcpool->mode)
virBufferAsprintf(buf, " mode='%s'", virBufferAsprintf(buf, " mode='%s'",
virStorageSourcePoolModeTypeToString(srcpool->mode)); virStorageSourcePoolModeTypeToString(src->srcpool->mode));
} }
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy); virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy);
virDomainDiskSourceDefFormatSeclabel(buf, nseclabels, seclabels, flags); virDomainDiskSourceDefFormatSeclabel(buf, src->nseclabels,
src->seclabels, flags);
break; break;
default: case VIR_STORAGE_TYPE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected disk type %s"), _("unexpected disk type %d"), src->type);
virStorageTypeToString(type));
return -1; return -1;
} }
} }
@ -14792,25 +14779,6 @@ virDomainDiskSourceDefFormatInternal(virBufferPtr buf,
} }
static int
virDomainDiskSourceDefFormat(virBufferPtr buf,
virDomainDiskDefPtr def,
unsigned int flags)
{
return virDomainDiskSourceDefFormatInternal(buf,
def->src.type,
def->src.path,
def->startupPolicy,
def->src.protocol,
def->src.nhosts,
def->src.hosts,
def->src.nseclabels,
def->src.seclabels,
def->src.srcpool,
flags);
}
static int static int
virDomainDiskDefFormat(virBufferPtr buf, virDomainDiskDefFormat(virBufferPtr buf,
virDomainDiskDefPtr def, virDomainDiskDefPtr def,
@ -14932,7 +14900,8 @@ virDomainDiskDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "</auth>\n"); virBufferAddLit(buf, "</auth>\n");
} }
if (virDomainDiskSourceDefFormat(buf, def, flags) < 0) if (virDomainDiskSourceFormat(buf, &def->src, def->startupPolicy,
flags) < 0)
return -1; return -1;
virDomainDiskGeometryDefFormat(buf, def); virDomainDiskGeometryDefFormat(buf, def);
virDomainDiskBlockIoDefFormat(buf, def); virDomainDiskBlockIoDefFormat(buf, def);

20
src/conf/domain_conf.h
View File

@ -2271,16 +2271,9 @@ int virDomainDefFormatInternal(virDomainDefPtr def,
unsigned int flags, unsigned int flags,
virBufferPtr buf); virBufferPtr buf);
int virDomainDiskSourceDefFormatInternal(virBufferPtr buf, int virDomainDiskSourceFormat(virBufferPtr buf,
int type, virStorageSourcePtr src,
const char *src,
int policy, int policy,
int protocol,
size_t nhosts,
virStorageNetHostDefPtr hosts,
size_t nseclabels,
virSecurityDeviceLabelDefPtr *seclabels,
virStorageSourcePoolDefPtr srcpool,
unsigned int flags); unsigned int flags);
int virDomainNetDefFormat(virBufferPtr buf, int virDomainNetDefFormat(virBufferPtr buf,
@ -2328,13 +2321,8 @@ virDomainDiskDefPtr
virDomainDiskRemove(virDomainDefPtr def, size_t i); virDomainDiskRemove(virDomainDefPtr def, size_t i);
virDomainDiskDefPtr virDomainDiskDefPtr
virDomainDiskRemoveByName(virDomainDefPtr def, const char *name); virDomainDiskRemoveByName(virDomainDefPtr def, const char *name);
int virDomainDiskSourceDefParse(xmlNodePtr node, int virDomainDiskSourceParse(xmlNodePtr node,
int type, virStorageSourcePtr src);
char **source,
int *proto,
size_t *nhosts,
virStorageNetHostDefPtr *hosts,
virStorageSourcePoolDefPtr *srcpool);
bool virDomainHasDiskMirror(virDomainObjPtr vm); bool virDomainHasDiskMirror(virDomainObjPtr vm);

17
src/conf/snapshot_conf.c
View File

@ -150,13 +150,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node,
if (!def->src.path && if (!def->src.path &&
xmlStrEqual(cur->name, BAD_CAST "source")) { xmlStrEqual(cur->name, BAD_CAST "source")) {
if (virDomainDiskSourceDefParse(cur, if (virDomainDiskSourceParse(cur, &def->src) < 0)
def->src.type,
&def->src.path,
&def->src.protocol,
&def->src.nhosts,
&def->src.hosts,
NULL) < 0)
goto cleanup; goto cleanup;
} else if (!def->src.format && } else if (!def->src.format &&
@ -635,14 +629,7 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf,
if (disk->src.format > 0) if (disk->src.format > 0)
virBufferEscapeString(buf, "<driver type='%s'/>\n", virBufferEscapeString(buf, "<driver type='%s'/>\n",
virStorageFileFormatTypeToString(disk->src.format)); virStorageFileFormatTypeToString(disk->src.format));
virDomainDiskSourceDefFormatInternal(buf, virDomainDiskSourceFormat(buf, &disk->src, 0, 0);
type,
disk->src.path,
0,
disk->src.protocol,
disk->src.nhosts,
disk->src.hosts,
0, NULL, NULL, 0);
virBufferAdjustIndent(buf, -2); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</disk>\n"); virBufferAddLit(buf, "</disk>\n");