[libvirt] [PATCH v4 11/14] 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(a)redhat.com>
---
src/conf/node_device_conf.h | 17 -----------------
src/conf/virnodedeviceobj.c | 11 +++++++++++
src/conf/virnodedeviceobj.h | 6 ++++++
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 90c7e1f..d10683d 100644
--- 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 7ebd4e8..04dba70 100644
--- 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(virNodeDeviceDefPtr def)
diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h
index 6ec5ee7..1122b67 100644
--- 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 {
--
2.9.4