External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-24 13:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use virDomainChrTypeFromString() instead of open coding

Browse Source 
* src/domain_conf.c: replace open coded chr type parsing with
  virDomainChrTypeFromString(), retaining the existing semantics
  where unknown types are silently mapped to the "null" type and
  "pty" is used if none is specified
This commit is contained in:
Mark McLoughlin 2009-07-10 09:33:34 +01:00
parent 62455ed872
commit 13709bdbf8
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/domain_conf.c
View File

@ -1204,32 +1204,11 @@ virDomainChrDefParseXML(virConnectPtr conn,
return NULL;
}
def->type = VIR_DOMAIN_CHR_TYPE_PTY;
type = virXMLPropString(node, "type");
if (type != NULL) {
if (STREQ(type, "null"))
def->type = VIR_DOMAIN_CHR_TYPE_NULL;
else if (STREQ(type, "vc"))
def->type = VIR_DOMAIN_CHR_TYPE_VC;
else if (STREQ(type, "pty"))
def->type = VIR_DOMAIN_CHR_TYPE_PTY;
else if (STREQ(type, "dev"))
def->type = VIR_DOMAIN_CHR_TYPE_DEV;
else if (STREQ(type, "file"))
def->type = VIR_DOMAIN_CHR_TYPE_FILE;
else if (STREQ(type, "pipe"))
def->type = VIR_DOMAIN_CHR_TYPE_PIPE;
else if (STREQ(type, "stdio"))
def->type = VIR_DOMAIN_CHR_TYPE_STDIO;
else if (STREQ(type, "udp"))
def->type = VIR_DOMAIN_CHR_TYPE_UDP;
else if (STREQ(type, "tcp"))
def->type = VIR_DOMAIN_CHR_TYPE_TCP;
else if (STREQ(type, "unix"))
def->type = VIR_DOMAIN_CHR_TYPE_UNIX;
else
def->type = VIR_DOMAIN_CHR_TYPE_NULL;
}
if (type == NULL)
def->type = VIR_DOMAIN_CHR_TYPE_PTY;
else if ((def->type = virDomainChrTypeFromString(type)) < 0)
def->type = VIR_DOMAIN_CHR_TYPE_NULL;
cur = node->children;
while (cur != NULL) {