Move from virnetworkobj.h into virnetworkobj.c
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/virnetworkobj.c | 21 +++++++++++++++++++++
src/conf/virnetworkobj.h | 20 --------------------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index aab737b..b44f604 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -37,6 +37,27 @@ VIR_LOG_INIT("conf.virnetworkobj");
/* currently, /sbin/tc implementation allows up to 16 bits for minor class size */
#define CLASS_ID_BITMAP_SIZE (1<<16)
+struct _virNetworkObj {
+ virObjectLockable parent;
+
+ pid_t dnsmasqPid;
+ pid_t radvdPid;
+ bool active;
+ int autostart;
+ bool persistent;
+
+ virNetworkDefPtr def; /* The current definition */
+ virNetworkDefPtr newDef; /* New definition to activate at shutdown */
+
+ virBitmapPtr classIdMap; /* bitmap of class IDs for QoS */
+ unsigned long long floor_sum; /* sum of all 'floor'-s of attached NICs */
+
+ unsigned int taint;
+
+ /* Immutable pointer, self locking APIs */
+ virMacMapPtr macmap;
+};
+
struct _virNetworkObjList {
virObjectLockable parent;
diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h
index d7199fd..857228a 100644
--- a/src/conf/virnetworkobj.h
+++ b/src/conf/virnetworkobj.h
@@ -26,26 +26,6 @@
typedef struct _virNetworkObj virNetworkObj;
typedef virNetworkObj *virNetworkObjPtr;
-struct _virNetworkObj {
- virObjectLockable parent;
-
- pid_t dnsmasqPid;
- pid_t radvdPid;
- bool active;
- int autostart;
- bool persistent;
-
- virNetworkDefPtr def; /* The current definition */
- virNetworkDefPtr newDef; /* New definition to activate at shutdown */
-
- virBitmapPtr classIdMap; /* bitmap of class IDs for QoS */
- unsigned long long floor_sum; /* sum of all 'floor'-s of attached NICs */
-
- unsigned int taint;
-
- /* Immutable pointer, self locking APIs */
- virMacMapPtr macmap;
-};
virNetworkObjPtr
virNetworkObjNew(void);
--
2.9.4