Move node device drivers to src/node_device/

* daemon/qemud.c, src/Makefile.am: Update for changed paths
* src/node_device*.{h,c}: Move to src/node_device/
* src/storage/storage_backend.c: Remove bogus import of node_device.c

diff --git a/daemon/qemud.c b/daemon/qemud.c
index aa7ea9d6d58b9b27ab6ec5edd8d21fb04ce1fa20..7972efe2ca9ad2a233a140ad4e7f3113a2011393 100644 (file)
--- a/daemon/qemud.c
+++ b/daemon/qemud.c
@@ -90,7 +90,7 @@
 #include "storage/storage_driver.h"
 #endif
 #ifdef WITH_NODE_DEVICES
-#include "node_device.h"
+#include "node_device/node_device_driver.h"
 #endif
 #include "secret_driver.h"
 #endif

diff --git a/src/Makefile.am b/src/Makefile.am
index 8360879c2cefc860c35bf798e269834a2f9595e4..81c40e45a89a0e5cefeb9306bc5d582320a4add6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -226,15 +226,15 @@ SECURITY_DRIVER_SELINUX_SOURCES =                         \
 
 
 NODE_DEVICE_DRIVER_SOURCES =                                   \
-               node_device.c node_device.h
+               node_device/node_device_driver.c node_device/node_device_driver.h
 
 NODE_DEVICE_DRIVER_HAL_SOURCES =                               \
-               node_device_hal.c                               \
-               node_device_hal.h                               \
-               node_device_hal_linux.c
+               node_device/node_device_hal.c                   \
+               node_device/node_device_hal.h                   \
+               node_device/node_device_hal_linux.c
 
 NODE_DEVICE_DRIVER_DEVKIT_SOURCES =                            \
-               node_device_devkit.c
+               node_device/node_device_devkit.c
 
 
 #########################

diff --git a/src/node_device_devkit.c b/src/node_device/node_device_devkit.c
similarity index 100%
rename from src/node_device_devkit.c
rename to src/node_device/node_device_devkit.c

diff --git a/src/node_device.c b/src/node_device/node_device_driver.c
similarity index 99%
rename from src/node_device.c
rename to src/node_device/node_device_driver.c
index 69e15b66a2840a9a6ab60c9d778bcab2c3dec950..93ca28c226bacf60361bb263faf6a061d0d0f09c 100644 (file)
--- a/src/node_device.c
+++ b/src/node_device/node_device_driver.c
@@ -34,7 +34,7 @@
 #include "logging.h"
 #include "node_device_conf.h"
 #include "node_device_hal.h"
-#include "node_device.h"
+#include "node_device_driver.h"
 #include "util.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV

diff --git a/src/node_device.h b/src/node_device/node_device_driver.h
similarity index 100%
rename from src/node_device.h
rename to src/node_device/node_device_driver.h

diff --git a/src/node_device_hal.c b/src/node_device/node_device_hal.c
similarity index 99%
rename from src/node_device_hal.c
rename to src/node_device/node_device_hal.c
index 3e3df7f4f493dc6288c3e5a52d31bb8b38bf7dcc..18be5ed9363a233c40109c7f7ea481885275a5af 100644 (file)
--- a/src/node_device_hal.c
+++ b/src/node_device/node_device_hal.c
@@ -36,7 +36,7 @@
 #include "memory.h"
 #include "uuid.h"
 #include "logging.h"
-#include "node_device.h"
+#include "node_device_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 

diff --git a/src/node_device_hal.h b/src/node_device/node_device_hal.h
similarity index 100%
rename from src/node_device_hal.h
rename to src/node_device/node_device_hal.h

diff --git a/src/node_device_hal_linux.c b/src/node_device/node_device_hal_linux.c
similarity index 99%
rename from src/node_device_hal_linux.c
rename to src/node_device/node_device_hal_linux.c
index ddb1eef7c7681c8a298cf5312c9cca839739d044..b7cf782232a60ad9e9cb5f2e468da7c4f6e57ee7 100644 (file)
--- a/src/node_device_hal_linux.c
+++ b/src/node_device/node_device_hal_linux.c
@@ -24,7 +24,7 @@
 
 #include <fcntl.h>
 
-#include "node_device.h"
+#include "node_device_driver.h"
 #include "node_device_hal.h"
 #include "virterror_internal.h"
 #include "memory.h"

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 800d4ea7b6bf2a6b6d78403c298b212502fb1004..b3c9b0ea7fb33da6f2919331b79eca52b80b5b2e 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -47,7 +47,6 @@
 #include "virterror_internal.h"
 #include "util.h"
 #include "memory.h"
-#include "node_device.h"
 #include "internal.h"
 #include "secret_conf.h"
 #include "uuid.h"