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: Rewrite virDomainChrSourceModeTypeFromString() using VIR_ENUM_IMPL()

Browse Source 
In domain_conf.c there's virDomainChrSourceModeTypeFromString()
which is open coded. Let's rewrite it using VIR_ENUM_DECL() +
VIR_ENUM_IMPL() combo.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2023-02-01 09:24:55 +01:00
parent 69db3bd954
commit 714af1a50c
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/conf/domain_conf.c
View File

@ -1516,6 +1516,21 @@ VIR_ENUM_IMPL(virDomainNetVhostuserMode,
"server", "server",
); );
typedef enum {
VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT,
VIR_DOMAIN_CHR_SOURCE_MODE_BIND,
VIR_DOMAIN_CHR_SOURCE_MODE_LAST
} virDomainChrSourceMode;
VIR_ENUM_DECL(virDomainChrSourceMode);
VIR_ENUM_IMPL(virDomainChrSourceMode,
VIR_DOMAIN_CHR_SOURCE_MODE_LAST,
"connect",
"bind",
);
static virClass *virDomainObjClass; static virClass *virDomainObjClass;
static virClass *virDomainXMLOptionClass; static virClass *virDomainXMLOptionClass;
@ -9846,26 +9861,6 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def,
return 0; return 0;
} }
typedef enum {
VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT,
VIR_DOMAIN_CHR_SOURCE_MODE_BIND,
} virDomainChrSourceModeType;
static int
virDomainChrSourceModeTypeFromString(const char *str)
{
if (!str)
return -1;
if (STREQ(str, "connect"))
return VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT;
if (STREQ(str, "bind"))
return VIR_DOMAIN_CHR_SOURCE_MODE_BIND;
return -1;
}
static int static int
virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def, virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def,
@ -9873,7 +9868,7 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
unsigned int flags) unsigned int flags)
{ {
virDomainChrSourceModeType mode; virDomainChrSourceMode mode;
if (virXMLPropEnumDefault(source, "mode", virDomainChrSourceModeTypeFromString, if (virXMLPropEnumDefault(source, "mode", virDomainChrSourceModeTypeFromString,
VIR_XML_PROP_NONE, &mode, VIR_XML_PROP_NONE, &mode,
@ -9911,7 +9906,7 @@ static int
virDomainChrSourceDefParseUDP(virDomainChrSourceDef *def, virDomainChrSourceDefParseUDP(virDomainChrSourceDef *def,
xmlNodePtr source) xmlNodePtr source)
{ {
virDomainChrSourceModeType mode; virDomainChrSourceMode mode;
if (virXMLPropEnumDefault(source, "mode", virDomainChrSourceModeTypeFromString, if (virXMLPropEnumDefault(source, "mode", virDomainChrSourceModeTypeFromString,
VIR_XML_PROP_NONE, &mode, VIR_XML_PROP_NONE, &mode,
@ -9937,7 +9932,7 @@ virDomainChrSourceDefParseUnix(virDomainChrSourceDef *def,
xmlNodePtr source, xmlNodePtr source,
xmlXPathContextPtr ctxt) xmlXPathContextPtr ctxt)
{ {
virDomainChrSourceModeType mode; virDomainChrSourceMode mode;
if (virXMLPropEnumDefault(source, "mode", virDomainChrSourceModeTypeFromString, if (virXMLPropEnumDefault(source, "mode", virDomainChrSourceModeTypeFromString,
VIR_XML_PROP_NONE, &mode, VIR_XML_PROP_NONE, &mode,