Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt

体验新版 GitCode，发现更多精彩内容 >>

提交 7d0ff943 编写于 作者: P Pavel Hrdina
浏览文件
操作

conf: switch from while to for loop for chardev parsing 

This removes one level of indentation.
Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
上级 e90ba254
隐藏空白更改
内联 并排
Showing with 83 addition and 83 deletion
src/conf/domain_conf.c
浏览文件 @ 7d0ff943
...@@ -10926,100 +10926,100 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, ...@@ -10926,100 +10926,100 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
char *haveTLS = NULL; char *haveTLS = NULL;
char *tlsFromConfig = NULL; char *tlsFromConfig = NULL;
while (cur != NULL) { for (; cur; cur = cur->next) {
if (cur->type == XML_ELEMENT_NODE) { if (cur->type != XML_ELEMENT_NODE)
if (virXMLNodeNameEqual(cur, "source")) { continue;
if (!mode)
mode = virXMLPropString(cur, "mode");
if (!haveTLS)
haveTLS = virXMLPropString(cur, "tls");
if (!tlsFromConfig)
tlsFromConfig = virXMLPropString(cur, "tlsFromConfig");
switch ((virDomainChrType) def->type) {
case VIR_DOMAIN_CHR_TYPE_FILE:
case VIR_DOMAIN_CHR_TYPE_PTY:
case VIR_DOMAIN_CHR_TYPE_DEV:
case VIR_DOMAIN_CHR_TYPE_PIPE:
case VIR_DOMAIN_CHR_TYPE_UNIX:
if (!append && def->type == VIR_DOMAIN_CHR_TYPE_FILE)
append = virXMLPropString(cur, "append");
/* PTY path is only parsed from live xml. */
if (!path &&
(def->type != VIR_DOMAIN_CHR_TYPE_PTY ||
!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)))
path = virXMLPropString(cur, "path");
break; if (virXMLNodeNameEqual(cur, "source")) {
if (!mode)
mode = virXMLPropString(cur, "mode");
if (!haveTLS)
haveTLS = virXMLPropString(cur, "tls");
if (!tlsFromConfig)
tlsFromConfig = virXMLPropString(cur, "tlsFromConfig");
switch ((virDomainChrType) def->type) {
case VIR_DOMAIN_CHR_TYPE_FILE:
case VIR_DOMAIN_CHR_TYPE_PTY:
case VIR_DOMAIN_CHR_TYPE_DEV:
case VIR_DOMAIN_CHR_TYPE_PIPE:
case VIR_DOMAIN_CHR_TYPE_UNIX:
if (!append && def->type == VIR_DOMAIN_CHR_TYPE_FILE)
append = virXMLPropString(cur, "append");
/* PTY path is only parsed from live xml. */
if (!path &&
(def->type != VIR_DOMAIN_CHR_TYPE_PTY ||
!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)))
path = virXMLPropString(cur, "path");
case VIR_DOMAIN_CHR_TYPE_UDP: break;
case VIR_DOMAIN_CHR_TYPE_TCP:
if (!mode || STREQ(mode, "connect")) {
if (!connectHost)
connectHost = virXMLPropString(cur, "host");
if (!connectService)
connectService = virXMLPropString(cur, "service");
} else if (STREQ(mode, "bind")) {
if (!bindHost)
bindHost = virXMLPropString(cur, "host");
if (!bindService)
bindService = virXMLPropString(cur, "service");
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown source mode '%s'"), mode);
goto error;
}
if (def->type == VIR_DOMAIN_CHR_TYPE_UDP) case VIR_DOMAIN_CHR_TYPE_UDP:
VIR_FREE(mode); case VIR_DOMAIN_CHR_TYPE_TCP:
break; if (!mode || STREQ(mode, "connect")) {
if (!connectHost)
connectHost = virXMLPropString(cur, "host");
if (!connectService)
connectService = virXMLPropString(cur, "service");
} else if (STREQ(mode, "bind")) {
if (!bindHost)
bindHost = virXMLPropString(cur, "host");
if (!bindService)
bindService = virXMLPropString(cur, "service");
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown source mode '%s'"), mode);
goto error;
}
case VIR_DOMAIN_CHR_TYPE_SPICEPORT: if (def->type == VIR_DOMAIN_CHR_TYPE_UDP)
if (!channel) VIR_FREE(mode);
channel = virXMLPropString(cur, "channel"); break;
break;
case VIR_DOMAIN_CHR_TYPE_NMDM: case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
if (!master) if (!channel)
master = virXMLPropString(cur, "master"); channel = virXMLPropString(cur, "channel");
if (!slave) break;
slave = virXMLPropString(cur, "slave");
break;
case VIR_DOMAIN_CHR_TYPE_LAST: case VIR_DOMAIN_CHR_TYPE_NMDM:
case VIR_DOMAIN_CHR_TYPE_NULL: if (!master)
case VIR_DOMAIN_CHR_TYPE_VC: master = virXMLPropString(cur, "master");
case VIR_DOMAIN_CHR_TYPE_STDIO: if (!slave)
case VIR_DOMAIN_CHR_TYPE_SPICEVMC: slave = virXMLPropString(cur, "slave");
break; break;
}
/* Check for an optional seclabel override in <source/>. */ case VIR_DOMAIN_CHR_TYPE_LAST:
if (chr_def) { case VIR_DOMAIN_CHR_TYPE_NULL:
xmlNodePtr saved_node = ctxt->node; case VIR_DOMAIN_CHR_TYPE_VC:
ctxt->node = cur; case VIR_DOMAIN_CHR_TYPE_STDIO:
if (virSecurityDeviceLabelDefParseXML(&def->seclabels, case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
&def->nseclabels, break;
vmSeclabels, }
nvmSeclabels,
ctxt, /* Check for an optional seclabel override in <source/>. */
flags) < 0) { if (chr_def) {
ctxt->node = saved_node; xmlNodePtr saved_node = ctxt->node;
goto error; ctxt->node = cur;
} if (virSecurityDeviceLabelDefParseXML(&def->seclabels,
&def->nseclabels,
vmSeclabels,
nvmSeclabels,
ctxt,
flags) < 0) {
ctxt->node = saved_node; ctxt->node = saved_node;
goto error;
} }
} else if (virXMLNodeNameEqual(cur, "log")) { ctxt->node = saved_node;
if (!logfile)
logfile = virXMLPropString(cur, "file");
if (!logappend)
logappend = virXMLPropString(cur, "append");
} else if (virXMLNodeNameEqual(cur, "protocol")) {
if (!protocol)
protocol = virXMLPropString(cur, "type");
} }
} else if (virXMLNodeNameEqual(cur, "log")) {
if (!logfile)
logfile = virXMLPropString(cur, "file");
if (!logappend)
logappend = virXMLPropString(cur, "append");
} else if (virXMLNodeNameEqual(cur, "protocol")) {
if (!protocol)
protocol = virXMLPropString(cur, "type");
} }
cur = cur->next;
} }
switch ((virDomainChrType) def->type) { switch ((virDomainChrType) def->type) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或