From: Osier Yang <jyang@redhat.com>
Date: Mon, 7 Jan 2013 17:05:27 +0000 (+0800)
Subject: nodedev: Remove the unused enum
X-Git-Tag: v1.0.4-rc1~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab4b0001887061881cb0849ed40da526bdbc0a31;p=thirdparty%2Flibvirt.git

nodedev: Remove the unused enum

Guess it was created for the fc_host and vports_ops capabilities
purpose, but there is enum virNodeDevScsiHostCapFlags for them,
and enum virNodeDevHBACapType is unused, and actually both
VIR_ENUM_DECL and VIR_ENUM_IMPL use the wrong enum name
"virNodeDevHBACap".
---

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index af89fe344e..e7072981a4 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -55,11 +55,6 @@ VIR_ENUM_IMPL(virNodeDevNetCap, VIR_NODE_DEV_CAP_NET_LAST,
               "80203",
               "80211")
 
-VIR_ENUM_IMPL(virNodeDevHBACap, VIR_NODE_DEV_CAP_HBA_LAST,
-              "fc_host",
-              "vport_ops")
-
-
 static int
 virNodeDevCapsDefParseString(const char *xpath,
                              xmlXPathContextPtr ctxt,
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 03380dfa96..fb1267f987 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -56,16 +56,8 @@ enum virNodeDevNetCapType {
     VIR_NODE_DEV_CAP_NET_LAST
 };
 
-enum virNodeDevHBACapType {
-    /* Keep in sync with VIR_ENUM_IMPL in node_device_conf.c */
-    VIR_NODE_DEV_CAP_HBA_FC_HOST,	/* fibre channel HBA */
-    VIR_NODE_DEV_CAP_HBA_VPORT_OPS,	/* capable of vport operations */
-    VIR_NODE_DEV_CAP_HBA_LAST
-};
-
 VIR_ENUM_DECL(virNodeDevCap)
 VIR_ENUM_DECL(virNodeDevNetCap)
-VIR_ENUM_DECL(virNodeDevHBACap)
 
 enum virNodeDevStorageCapFlags {
     VIR_NODE_DEV_CAP_STORAGE_REMOVABLE			= (1 << 0),