[PATCH 2/3] virsh: Use VIR_ENUM* macros for vshCmdAttachInterface

[Michal Privoznik <mprivozn@xxxxxxxxxx>]

Instead of verbose string to enum conversion (if STREQ() else if
STREQ() else if STREQ() ...) lets use awesome VIR_ENUM_* macros.

Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx>
---
 tools/virsh-domain.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index b465eb5..c7e4926 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -855,10 +855,16 @@ static int parseRateStr(const char *rateStr, virNetDevBandwidthRatePtr rate)
 }
 
 typedef enum {
-    IFACE_TYPE_NETWORK,
+    IFACE_TYPE_NETWORK = 0,
     IFACE_TYPE_BRIDGE,
+    IFACE_TYPE_LAST,
 } vshCmdAttachInterfaceType;
 
+VIR_ENUM_DECL(vshCmdAttachInterface)
+VIR_ENUM_IMPL(vshCmdAttachInterface, IFACE_TYPE_LAST,
+              "network",
+              "bridge")
+
 static bool
 cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
 {
@@ -906,11 +912,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
         goto cleanup;
 
     /* check interface type */
-    if (STREQ(type, "network")) {
-        typ = IFACE_TYPE_NETWORK;
-    } else if (STREQ(type, "bridge")) {
-        typ = IFACE_TYPE_BRIDGE;
-    } else {
+    if ((typ = vshCmdAttachInterfaceTypeFromString(type)) < 0) {
         vshError(ctl, _("No support for %s in command 'attach-interface'"),
                  type);
         goto cleanup;
@@ -943,10 +945,16 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
     virBufferAsprintf(&buf, "<interface type='%s'>\n", type);
     virBufferAdjustIndent(&buf, 2);
 
-    if (typ == IFACE_TYPE_NETWORK)
-        virBufferAsprintf(&buf, "<source network='%s'/>\n", source);
-    else if (typ == IFACE_TYPE_BRIDGE)
-        virBufferAsprintf(&buf, "<source bridge='%s'/>\n", source);
+    switch (typ) {
+    case IFACE_TYPE_NETWORK:
+    case IFACE_TYPE_BRIDGE:
+        virBufferAsprintf(&buf, "<source %s='%s'/>\n",
+                          vshCmdAttachInterfaceTypeToString(typ), source);
+        break;
+    case IFACE_TYPE_LAST:
+        /* nada */
+        break;
+    }
 
     if (target != NULL)
         virBufferAsprintf(&buf, "<target dev='%s'/>\n", target);
-- 
2.0.5

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list