[libvirt] [PATCH] Move virNetDevVPort enum impl into virnetdevvportprofile.c

Daniel P. Berrange berrange at redhat.com
Thu Oct 10 16:30:54 UTC 2013


From: "Daniel P. Berrange" <berrange at redhat.com>

The enum for virNetDevVPort is declared in the header file
virnetdevvportprofile.h, but for some reason the impl is
in netdev_vport_profile_conf.c.

This causes a dep from src/util onto src/conf which is not
allowed. Move the enum impl into virnetdevvportprofile.c
to break the circle.

Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
---
 src/conf/netdev_vport_profile_conf.c | 7 -------
 src/util/virnetdevvportprofile.c     | 6 ++++++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c
index e8199e2..a16a04a 100644
--- a/src/conf/netdev_vport_profile_conf.c
+++ b/src/conf/netdev_vport_profile_conf.c
@@ -30,13 +30,6 @@
 #define VIR_FROM_THIS VIR_FROM_NONE
 
 
-VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST,
-              "none",
-              "802.1Qbg",
-              "802.1Qbh",
-              "openvswitch")
-
-
 virNetDevVPortProfilePtr
 virNetDevVPortProfileParse(xmlNodePtr node, unsigned int flags)
 {
diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c
index 07155b9..1cae20a 100644
--- a/src/util/virnetdevvportprofile.c
+++ b/src/util/virnetdevvportprofile.c
@@ -29,6 +29,12 @@
 
 #define VIR_FROM_THIS VIR_FROM_NET
 
+VIR_ENUM_IMPL(virNetDevVPort, VIR_NETDEV_VPORT_PROFILE_LAST,
+              "none",
+              "802.1Qbg",
+              "802.1Qbh",
+              "openvswitch")
+
 VIR_ENUM_IMPL(virNetDevVPortProfileOp, VIR_NETDEV_VPORT_PROFILE_OP_LAST,
               "create",
               "save",
-- 
1.8.3.1




More information about the libvir-list mailing list