提交 4a0da345 编写于 作者: P Peter Krempa

conf: Sanitize formatting of UDP chardev source

Use much simpler logic to determine parts of the code to print.
上级 c7d3cf2e
...@@ -21394,32 +21394,22 @@ virDomainChrSourceDefFormat(virBufferPtr buf, ...@@ -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) { if (def->data.udp.connectService || def->data.udp.connectHost) {
virBufferEscapeString(buf, "<source mode='bind' service='%s'/>\n", virBufferAddLit(buf, "<source mode='connect'");
def->data.udp.bindService); if (def->data.udp.connectService)
} virBufferEscapeString(buf, " host='%s'", def->data.udp.connectHost);
if (def->data.udp.connectService)
if (def->data.udp.connectService && virBufferEscapeString(buf, " service='%s'", def->data.udp.connectService);
def->data.udp.connectHost) { virBufferAddLit(buf, "/>\n");
virBufferEscapeString(buf, "<source mode='connect' host='%s' ",
def->data.udp.connectHost);
virBufferEscapeString(buf, "service='%s'/>\n",
def->data.udp.connectService);
} else if (def->data.udp.connectHost) {
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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册