From 1fb4d8923ff203d6bc31b1e1d89126e5670cb019 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 10 Oct 2013 16:41:05 +0100 Subject: [PATCH] Move virNetDevVPort enum impl into virnetdevvportprofile.c 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 --- 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 e8199e2d0..a16a04a83 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 07155b9f3..1cae20a27 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", -- 2.39.5