From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 9 Feb 2015 14:53:54 +0000 (+0100)
Subject: virsh attach-interface: Use enum instead of arbitrary integers
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=18bcba55cdb2cfcba671c6ccfd4b6ae49cb384e3;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

virsh attach-interface: Use enum instead of arbitrary integers

The type of interface to attach is held in the variable 'typ'.
Depending on interface type selected by user, the variable is set
either to 1 (network), or 2 (bridge). Lets use already existing
enum from domain_conf.h instead: virDomainNetType.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 20bafbeb8..da8eb0f50 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -906,7 +906,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
                 *type = NULL, *source = NULL, *model = NULL,
                 *inboundStr = NULL, *outboundStr = NULL;
     virNetDevBandwidthRate inbound, outbound;
-    int typ;
+    virDomainNetType typ;
     int ret;
     bool functionReturn = false;
     virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -946,9 +946,9 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
 
     /* check interface type */
     if (STREQ(type, "network")) {
-        typ = 1;
+        typ = VIR_DOMAIN_NET_TYPE_NETWORK;
     } else if (STREQ(type, "bridge")) {
-        typ = 2;
+        typ = VIR_DOMAIN_NET_TYPE_BRIDGE;
     } else {
         vshError(ctl, _("No support for %s in command 'attach-interface'"),
                  type);
@@ -982,9 +982,9 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd)
     virBufferAsprintf(&buf, "<interface type='%s'>\n", type);
     virBufferAdjustIndent(&buf, 2);
 
-    if (typ == 1)
+    if (typ == VIR_DOMAIN_NET_TYPE_NETWORK)
         virBufferAsprintf(&buf, "<source network='%s'/>\n", source);
-    else if (typ == 2)
+    else if (typ == VIR_DOMAIN_NET_TYPE_BRIDGE)
         virBufferAsprintf(&buf, "<source bridge='%s'/>\n", source);
 
     if (target != NULL)