External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: error out for multiple log elements while parsing chardev

Browse Source 
Remove check whether a variable was already set because the element
is parsed only once now.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-08-18 15:15:28 +02:00
parent 21bfd1e9b9
commit 23482e4b1e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/domain_conf.c
View File

@ -10925,6 +10925,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
char *append = NULL; char *append = NULL;
char *haveTLS = NULL; char *haveTLS = NULL;
char *tlsFromConfig = NULL; char *tlsFromConfig = NULL;
bool logParsed = false;
int sourceParsed = 0; int sourceParsed = 0;
for (; cur; cur = cur->next) { for (; cur; cur = cur->next) {
@ -11029,10 +11030,15 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
ctxt->node = saved_node; ctxt->node = saved_node;
} }
} else if (virXMLNodeNameEqual(cur, "log")) { } else if (virXMLNodeNameEqual(cur, "log")) {
if (!logfile) if (logParsed) {
logfile = virXMLPropString(cur, "file"); virReportError(VIR_ERR_XML_ERROR, "%s",
if (!logappend) _("only one protocol element is allowed for "
logappend = virXMLPropString(cur, "append"); "character device"));
goto error;
}
logParsed = true;
logfile = virXMLPropString(cur, "file");
logappend = virXMLPropString(cur, "append");
} else if (virXMLNodeNameEqual(cur, "protocol")) { } else if (virXMLNodeNameEqual(cur, "protocol")) {
if (!protocol) if (!protocol)
protocol = virXMLPropString(cur, "type"); protocol = virXMLPropString(cur, "type");