Re: [libvirt] [PATCH 08/17] conf: move chardev protocol parsing to separate function

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- src/conf/domain_conf.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bb4be5d1cd..8fe79f70bf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11040,7 +11063,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, goto error; } protocolParsed = true; - protocol = virXMLPropString(cur, "type"); + if (virDomainChrSourceDefParseProtocol(def, cur) < 0) + goto error; } } @@ -11151,16 +11175,6 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, } def->data.tcp.tlsFromConfig = !!tmp; } - - if (!protocol) - def->data.tcp.protocol = VIR_DOMAIN_CHR_TCP_PROTOCOL_RAW;

- else if ((def->data.tcp.protocol = - virDomainChrTcpProtocolTypeFromString(protocol)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown protocol '%s'"), protocol); - goto error; - } - break; case VIR_DOMAIN_CHR_TYPE_UDP: