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 protocol 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:17:34 +02:00
parent 23482e4b1e
commit 209fa11b02
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/conf/domain_conf.c
View File

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