nodedev: Privatize _virNodeDeviceObj and _virNodeDeviceObjList

Move the structures to withing virnodedeviceobj.c

Move the typedefs from node_device_conf to virnodedeviceobj.h

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 90c7e1fc267d4d68abfbb1a64545a14cf3b298d3..d10683d69e3f4ba4a82fbe34cf16ac108ec8e326 100644 (file)
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -328,23 +328,6 @@ struct _virNodeDeviceDef {
     virNodeDevCapsDefPtr caps;         /* optional device capabilities */
 };
 
-
-typedef struct _virNodeDeviceObj virNodeDeviceObj;
-typedef virNodeDeviceObj *virNodeDeviceObjPtr;
-struct _virNodeDeviceObj {
-    virMutex lock;
-
-    virNodeDeviceDefPtr def;           /* device definition */
-
-};
-
-typedef struct _virNodeDeviceObjList virNodeDeviceObjList;
-typedef virNodeDeviceObjList *virNodeDeviceObjListPtr;
-struct _virNodeDeviceObjList {
-    size_t count;
-    virNodeDeviceObjPtr *objs;
-};
-
 char *
 virNodeDeviceDefFormat(const virNodeDeviceDef *def);
 

diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 781f35d0deaec46d3a66c4bc8862aaed32d330f9..596fc7566648b52ff3be2948fe812f52ffe65ccd 100644 (file)
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -32,6 +32,17 @@
 
 VIR_LOG_INIT("conf.virnodedeviceobj");
 
+struct _virNodeDeviceObj {
+    virMutex lock;
+
+    virNodeDeviceDefPtr def;           /* device definition */
+};
+
+struct _virNodeDeviceObjList {
+    size_t count;
+    virNodeDeviceObjPtr *objs;
+};
+
 
 static virNodeDeviceObjPtr
 virNodeDeviceObjNew(void)

diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index 6ec5ee7636cbbbcbd6c640a8a829b8644470df4e..1122b67a85c510c32596e0538e4106b108ba7bc0 100644 (file)
--- a/src/conf/virnodedeviceobj.h
+++ b/src/conf/virnodedeviceobj.h
@@ -27,6 +27,12 @@
 # include "object_event.h"
 
 
+typedef struct _virNodeDeviceObj virNodeDeviceObj;
+typedef virNodeDeviceObj *virNodeDeviceObjPtr;
+
+typedef struct _virNodeDeviceObjList virNodeDeviceObjList;
+typedef virNodeDeviceObjList *virNodeDeviceObjListPtr;
+
 typedef struct _virNodeDeviceDriverState virNodeDeviceDriverState;
 typedef virNodeDeviceDriverState *virNodeDeviceDriverStatePtr;
 struct _virNodeDeviceDriverState {