shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

conf: don't close the source element inside different function

Browse Source 
While formatting disk or chardev element they both uses
virDomainDiskSourceDefFormatSeclabel() function which also closes
the source element.  This is not extendable.

Use the new virXMLFormatElement() to properly format the source
element with possible child elements.

As a side effect it fixes a bug in disk source formatting.

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-08-24 16:46:58 +02:00
parent 4e56a3e793
commit e02ff020ca
2 changed files with 59 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
src/conf/domain_conf.c
View File

@ -21500,14 +21500,8 @@ virDomainDiskSourceDefFormatSeclabel(virBufferPtr buf,
size_t n; size_t n;
if (nseclabels && !skipSeclables) { if (nseclabels && !skipSeclables) {
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
for (n = 0; n < nseclabels; n++) for (n = 0; n < nseclabels; n++)
virSecurityDeviceLabelDefFormat(buf, seclabels[n], flags); virSecurityDeviceLabelDefFormat(buf, seclabels[n], flags);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</source>\n");
} else {
virBufferAddLit(buf, "/>\n");
} }
} }
@ -21580,6 +21574,10 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
bool skipSeclabels) bool skipSeclabels)
{ {
const char *startupPolicy = NULL; const char *startupPolicy = NULL;
virBuffer attrBuf = VIR_BUFFER_INITIALIZER;
virBuffer childBuf = VIR_BUFFER_INITIALIZER;
virBufferSetChildIndent(&childBuf, buf);
if (policy) if (policy)
startupPolicy = virDomainStartupPolicyTypeToString(policy); startupPolicy = virDomainStartupPolicyTypeToString(policy);
@ -21587,51 +21585,45 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
if (src->path || src->nhosts > 0 || src->srcpool || startupPolicy) { if (src->path || src->nhosts > 0 || src->srcpool || startupPolicy) {
switch ((virStorageType)src->type) { switch ((virStorageType)src->type) {
case VIR_STORAGE_TYPE_FILE: case VIR_STORAGE_TYPE_FILE:
virBufferAddLit(buf, "<source"); virBufferEscapeString(&attrBuf, " file='%s'", src->path);
virBufferEscapeString(buf, " file='%s'", src->path); virBufferEscapeString(&attrBuf, " startupPolicy='%s'", startupPolicy);
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy);
virDomainDiskSourceDefFormatSeclabel(buf, src->nseclabels, virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels,
src->seclabels, flags, src->seclabels, flags,
skipSeclabels); skipSeclabels);
break; break;
case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_BLOCK:
virBufferAddLit(buf, "<source"); virBufferEscapeString(&attrBuf, " dev='%s'", src->path);
virBufferEscapeString(buf, " dev='%s'", src->path); virBufferEscapeString(&attrBuf, " startupPolicy='%s'", startupPolicy);
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy);
virDomainDiskSourceDefFormatSeclabel(buf, src->nseclabels, virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels,
src->seclabels, flags, src->seclabels, flags,
skipSeclabels); skipSeclabels);
break; break;
case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_DIR:
virBufferAddLit(buf, "<source"); virBufferEscapeString(&attrBuf, " dir='%s'", src->path);
virBufferEscapeString(buf, " dir='%s'", src->path); virBufferEscapeString(&attrBuf, " startupPolicy='%s'", startupPolicy);
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy);
virBufferAddLit(buf, "/>\n");
break; break;
case VIR_STORAGE_TYPE_NETWORK: case VIR_STORAGE_TYPE_NETWORK:
if (virDomainDiskSourceFormatNetwork(buf, src) < 0) if (virDomainDiskSourceFormatNetwork(buf, src) < 0)
return -1; goto error;
break; break;
case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_VOLUME:
virBufferAddLit(buf, "<source");
if (src->srcpool) { if (src->srcpool) {
virBufferEscapeString(buf, " pool='%s'", src->srcpool->pool); virBufferEscapeString(&attrBuf, " pool='%s'", src->srcpool->pool);
virBufferEscapeString(buf, " volume='%s'", virBufferEscapeString(&attrBuf, " volume='%s'",
src->srcpool->volume); src->srcpool->volume);
if (src->srcpool->mode) if (src->srcpool->mode)
virBufferAsprintf(buf, " mode='%s'", virBufferAsprintf(&attrBuf, " mode='%s'",
virStorageSourcePoolModeTypeToString(src->srcpool->mode)); virStorageSourcePoolModeTypeToString(src->srcpool->mode));
} }
virBufferEscapeString(buf, " startupPolicy='%s'", startupPolicy); virBufferEscapeString(&attrBuf, " startupPolicy='%s'", startupPolicy);
virDomainDiskSourceDefFormatSeclabel(buf, src->nseclabels, virDomainDiskSourceDefFormatSeclabel(&childBuf, src->nseclabels,
src->seclabels, flags, src->seclabels, flags,
skipSeclabels); skipSeclabels);
break; break;
@ -21640,11 +21632,19 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
case VIR_STORAGE_TYPE_LAST: case VIR_STORAGE_TYPE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected disk type %d"), src->type); _("unexpected disk type %d"), src->type);
return -1; goto error;
} }
if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0)
goto error;
} }
return 0; return 0;
error:
virBufferFreeAndReset(&attrBuf);
virBufferFreeAndReset(&childBuf);
return -1;
} }
@ -23070,11 +23070,15 @@ virDomainChrAttrsDefFormat(virBufferPtr buf,
return 0; return 0;
} }
static void static int
virDomainChrSourceDefFormat(virBufferPtr buf, virDomainChrSourceDefFormat(virBufferPtr buf,
virDomainChrSourceDefPtr def, virDomainChrSourceDefPtr def,
unsigned int flags) unsigned int flags)
{ {
virBuffer attrBuf = VIR_BUFFER_INITIALIZER;
virBuffer childBuf = VIR_BUFFER_INITIALIZER;
virBufferSetChildIndent(&childBuf, buf);
switch ((virDomainChrType)def->type) { switch ((virDomainChrType)def->type) {
case VIR_DOMAIN_CHR_TYPE_NULL: case VIR_DOMAIN_CHR_TYPE_NULL:
@ -23092,14 +23096,17 @@ virDomainChrSourceDefFormat(virBufferPtr buf,
if (def->type != VIR_DOMAIN_CHR_TYPE_PTY || if (def->type != VIR_DOMAIN_CHR_TYPE_PTY ||
(def->data.file.path && (def->data.file.path &&
!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) { !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))) {
virBufferEscapeString(buf, "<source path='%s'", virBufferEscapeString(&attrBuf, " path='%s'",
def->data.file.path); def->data.file.path);
if (def->type == VIR_DOMAIN_CHR_TYPE_FILE && if (def->type == VIR_DOMAIN_CHR_TYPE_FILE &&
def->data.file.append != VIR_TRISTATE_SWITCH_ABSENT) def->data.file.append != VIR_TRISTATE_SWITCH_ABSENT)
virBufferAsprintf(buf, " append='%s'", virBufferAsprintf(&attrBuf, " append='%s'",
virTristateSwitchTypeToString(def->data.file.append)); virTristateSwitchTypeToString(def->data.file.append));
virDomainSourceDefFormatSeclabel(buf, def->nseclabels, virDomainSourceDefFormatSeclabel(&childBuf, def->nseclabels,
def->seclabels, flags); def->seclabels, flags);
if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0)
goto error;
} }
break; break;
@ -23130,19 +23137,21 @@ virDomainChrSourceDefFormat(virBufferPtr buf,
break; break;
case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_TCP:
virBufferAsprintf(buf, "<source mode='%s' ", virBufferAsprintf(&attrBuf, " mode='%s' ",
def->data.tcp.listen ? "bind" : "connect"); def->data.tcp.listen ? "bind" : "connect");
virBufferEscapeString(buf, "host='%s' ", def->data.tcp.host); virBufferEscapeString(&attrBuf, "host='%s' ", def->data.tcp.host);
virBufferEscapeString(buf, "service='%s'", def->data.tcp.service); virBufferEscapeString(&attrBuf, "service='%s'", def->data.tcp.service);
if (def->data.tcp.haveTLS != VIR_TRISTATE_BOOL_ABSENT && if (def->data.tcp.haveTLS != VIR_TRISTATE_BOOL_ABSENT &&
!(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && !(flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE &&
def->data.tcp.tlsFromConfig)) def->data.tcp.tlsFromConfig))
virBufferAsprintf(buf, " tls='%s'", virBufferAsprintf(&attrBuf, " tls='%s'",
virTristateBoolTypeToString(def->data.tcp.haveTLS)); virTristateBoolTypeToString(def->data.tcp.haveTLS));
if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS) if (flags & VIR_DOMAIN_DEF_FORMAT_STATUS)
virBufferAsprintf(buf, " tlsFromConfig='%d'", virBufferAsprintf(&attrBuf, " tlsFromConfig='%d'",
def->data.tcp.tlsFromConfig); def->data.tcp.tlsFromConfig);
virBufferAddLit(buf, "/>\n");
if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0)
goto error;
virBufferAsprintf(buf, "<protocol type='%s'/>\n", virBufferAsprintf(buf, "<protocol type='%s'/>\n",
virDomainChrTcpProtocolTypeToString( virDomainChrTcpProtocolTypeToString(
@ -23151,11 +23160,14 @@ virDomainChrSourceDefFormat(virBufferPtr buf,
case VIR_DOMAIN_CHR_TYPE_UNIX: case VIR_DOMAIN_CHR_TYPE_UNIX:
if (def->data.nix.path) { if (def->data.nix.path) {
virBufferAsprintf(buf, "<source mode='%s'", virBufferAsprintf(&attrBuf, " mode='%s'",
def->data.nix.listen ? "bind" : "connect"); def->data.nix.listen ? "bind" : "connect");
virBufferEscapeString(buf, " path='%s'", def->data.nix.path); virBufferEscapeString(&attrBuf, " path='%s'", def->data.nix.path);
virDomainSourceDefFormatSeclabel(buf, def->nseclabels, virDomainSourceDefFormatSeclabel(&childBuf, def->nseclabels,
def->seclabels, flags); def->seclabels, flags);
if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0)
goto error;
} }
break; break;
@ -23175,7 +23187,12 @@ virDomainChrSourceDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
return; return 0;
error:
virBufferFreeAndReset(&attrBuf);
virBufferFreeAndReset(&childBuf);
return -1;
} }
static int static int

3
tests/qemuxml2xmloutdata/qemuxml2xmlout-seclabel-dynamic-labelskip.xml
View File

@ -15,8 +15,7 @@
<devices> <devices>
<emulator>/usr/bin/qemu-system-i686</emulator> <emulator>/usr/bin/qemu-system-i686</emulator>
<disk type='block' device='disk'> <disk type='block' device='disk'>
<source dev='/dev/HostVG/QEMUGuest1'> <source dev='/dev/HostVG/QEMUGuest1'/>
</source>
<target dev='hda' bus='ide'/> <target dev='hda' bus='ide'/>
<address type='drive' controller='0' bus='0' target='0' unit='0'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/>
</disk> </disk>