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

domain_conf: Remove function virDomainChrSourceDefParseMode

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:56 +02:00 committed by Michal Privoznik
parent 170288c408
commit 47d810c4f2
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/conf/domain_conf.c
View File

@ -11469,31 +11469,6 @@ virDomainChrSourceModeTypeFromString(const char *str)
return -1; return -1;
} }
/**
* virDomainChrSourceDefParseMode:
* @source: XML dom node
*
* Returns: -1 in case of error,
* virDomainChrSourceModeType in case of success
*/
static int
virDomainChrSourceDefParseMode(xmlNodePtr source)
{
g_autofree char *mode = virXMLPropString(source, "mode");
int result;
if (!mode)
return VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
if ((result = virDomainChrSourceModeTypeFromString(mode)) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unknown source mode '%s'"), mode);
return -1;
}
return result;
}
static int static int
virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def, virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def,
@ -11501,11 +11476,12 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
unsigned int flags) unsigned int flags)
{ {
int mode; virDomainChrSourceModeType mode = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
int tmpVal; int tmpVal;
g_autofree char *tmp = NULL; g_autofree char *tmp = NULL;
if ((mode = virDomainChrSourceDefParseMode(source)) < 0) if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromString,
VIR_XML_PROP_NONE, &mode) < 0)
return -1; return -1;
def->data.tcp.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND; def->data.tcp.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND;
@ -11549,9 +11525,10 @@ static int
virDomainChrSourceDefParseUDP(virDomainChrSourceDef *def, virDomainChrSourceDefParseUDP(virDomainChrSourceDef *def,
xmlNodePtr source) xmlNodePtr source)
{ {
int mode; virDomainChrSourceModeType mode = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
if ((mode = virDomainChrSourceDefParseMode(source)) < 0) if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromString,
VIR_XML_PROP_NONE, &mode) < 0)
return -1; return -1;
if (mode == VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT && if (mode == VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT &&
@ -11573,9 +11550,10 @@ virDomainChrSourceDefParseUnix(virDomainChrSourceDef *def,
xmlNodePtr source, xmlNodePtr source,
xmlXPathContextPtr ctxt) xmlXPathContextPtr ctxt)
{ {
int mode; virDomainChrSourceModeType mode = VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
if ((mode = virDomainChrSourceDefParseMode(source)) < 0) if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromString,
VIR_XML_PROP_NONE, &mode) < 0)
return -1; return -1;
def->data.nix.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND; def->data.nix.listen = mode == VIR_DOMAIN_CHR_SOURCE_MODE_BIND;