From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 5 Dec 2019 14:59:47 +0000 (+0100)
Subject: virsh: Use VIR_ENUM_* instead of open coding string -> enum conversion
X-Git-Tag: v6.0.0-rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79b9328d76207298e795f2f84c7e28ce096ddef2;p=thirdparty%2Flibvirt.git

virsh: Use VIR_ENUM_* instead of open coding string -> enum conversion

There are more occurrences, but I'm converting --source argument
of domifaddr command only, because I will need it in next commit.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
index 9e6bc99bf2..de4abbaee7 100644
--- a/tools/virsh-domain-monitor.c
+++ b/tools/virsh-domain-monitor.c
@@ -2358,6 +2358,13 @@ static const vshCmdOptDef opts_domifaddr[] = {
     {.name = NULL}
 };
 
+VIR_ENUM_DECL(virshDomainInterfaceAddressesSource);
+VIR_ENUM_IMPL(virshDomainInterfaceAddressesSource,
+              VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LAST,
+              "lease",
+              "agent",
+              "arp");
+
 static bool
 cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd)
 {
@@ -2379,17 +2386,10 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd)
     if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0)
         goto cleanup;
 
-    if (sourcestr) {
-        if (STREQ(sourcestr, "lease")) {
-            source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE;
-        } else if (STREQ(sourcestr, "agent")) {
-            source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT;
-        } else if (STREQ(sourcestr, "arp")) {
-            source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP;
-        } else {
-            vshError(ctl, _("Unknown data source '%s'"), sourcestr);
-            goto cleanup;
-        }
+    if (sourcestr &&
+        (source = virshDomainInterfaceAddressesSourceTypeFromString(sourcestr)) < 0) {
+        vshError(ctl, _("Unknown data source '%s'"), sourcestr);
+        goto cleanup;
     }
 
     if ((ifaces_count = virDomainInterfaceAddresses(dom, &ifaces, source, 0)) < 0) {