NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virDomainChrSourceDefParseTCP: Use virXMLProp*

Browse Source 
Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-04-22 12:32:57 +02:00 committed by Michal Privoznik
parent 47d810c4f2
commit fa48004af5
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/conf/domain_conf.c
View File

@ -11477,8 +11477,6 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def,
unsigned int flags) unsigned int flags)
{ {
virDomainChrSourceModeType mode = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; virDomainChrSourceModeType mode = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
int tmpVal;
g_autofree char *tmp = NULL;
if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromString, if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromString,
VIR_XML_PROP_NONE, &mode) < 0) VIR_XML_PROP_NONE, &mode) < 0)
@ -11488,26 +11486,16 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def,
def->data.tcp.host = virXMLPropString(source, "host"); def->data.tcp.host = virXMLPropString(source, "host");
def->data.tcp.service = virXMLPropString(source, "service"); def->data.tcp.service = virXMLPropString(source, "service");
if ((tmp = virXMLPropString(source, "tls"))) { if (virXMLPropTristateBool(source, "tls", VIR_XML_PROP_NONE,
int value; &def->data.tcp.haveTLS) < 0)
if ((value = virTristateBoolTypeFromString(tmp)) <= 0) { return -1;
virReportError(VIR_ERR_XML_ERROR,
_("unknown chardev 'tls' setting '%s'"),
tmp);
return -1;
}
def->data.tcp.haveTLS = value;
VIR_FREE(tmp);
}
if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && if (flags & VIR_DOMAIN_DEF_PARSE_STATUS) {
(tmp = virXMLPropString(source, "tlsFromConfig"))) { int tmpVal;
if (virStrToLong_i(tmp, NULL, 10, &tmpVal) < 0) {
virReportError(VIR_ERR_XML_ERROR, if (virXMLPropInt(source, "tlsFromConfig", 10, VIR_XML_PROP_NONE,
_("Invalid tlsFromConfig value: %s"), &tmpVal) < 0)
tmp);
return -1; return -1;
}
def->data.tcp.tlsFromConfig = !!tmpVal; def->data.tcp.tlsFromConfig = !!tmpVal;
} }