External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 16:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Sanitize formatting of UDP chardev source

Browse Source 
Use much simpler logic to determine parts of the code to print.
This commit is contained in:
Peter Krempa 2016-09-26 17:15:00 +02:00
parent c7d3cf2e3b
commit 4a0da345d0
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/conf/domain_conf.c
View File

@ -21394,32 +21394,22 @@ virDomainChrSourceDefFormat(virBufferPtr buf,
break; break;
case VIR_DOMAIN_CHR_TYPE_UDP: case VIR_DOMAIN_CHR_TYPE_UDP:
if (def->data.udp.bindService && if (def->data.udp.bindService || def->data.udp.bindHost) {
def->data.udp.bindHost) { virBufferAddLit(buf, "<source mode='bind'");
virBufferEscapeString(buf, "<source mode='bind' host='%s' ", if (def->data.udp.bindService)
def->data.udp.bindHost); virBufferEscapeString(buf, " host='%s'", def->data.udp.bindHost);
virBufferEscapeString(buf, "service='%s'/>\n", if (def->data.udp.bindService)
def->data.udp.bindService); virBufferEscapeString(buf, " service='%s'", def->data.udp.bindService);
} else if (def->data.udp.bindHost) { virBufferAddLit(buf, "/>\n");
virBufferEscapeString(buf, "<source mode='bind' host='%s'/>\n",
def->data.udp.bindHost);
} else if (def->data.udp.bindService) {
virBufferEscapeString(buf, "<source mode='bind' service='%s'/>\n",
def->data.udp.bindService);
} }
if (def->data.udp.connectService && if (def->data.udp.connectService || def->data.udp.connectHost) {
def->data.udp.connectHost) { virBufferAddLit(buf, "<source mode='connect'");
virBufferEscapeString(buf, "<source mode='connect' host='%s' ", if (def->data.udp.connectService)
def->data.udp.connectHost); virBufferEscapeString(buf, " host='%s'", def->data.udp.connectHost);
virBufferEscapeString(buf, "service='%s'/>\n", if (def->data.udp.connectService)
def->data.udp.connectService); virBufferEscapeString(buf, " service='%s'", def->data.udp.connectService);
} else if (def->data.udp.connectHost) { virBufferAddLit(buf, "/>\n");
virBufferEscapeString(buf, "<source mode='connect' host='%s'/>\n",
def->data.udp.connectHost);
} else if (def->data.udp.connectService) {
virBufferEscapeString(buf, "<source mode='connect' service='%s'/>\n",
def->data.udp.connectService);
} }
break; break;