Move network driver into src/network

* daemon/qemud.c, src/Makefile.am: Adapt for changed paths
* src/network_driver.c: Rename to src/network/bridge_driver.c
* src/network_driver.h: Rename to src/network/bridge_driver.h

diff --git a/daemon/qemud.c b/daemon/qemud.c
index 67c49b389d40a187a87069bfa6653fde811b51a9..9a6f0fff94b055f1a7faebe7b97def08d83d7f4d 100644 (file)
--- a/daemon/qemud.c
+++ b/daemon/qemud.c
@@ -81,7 +81,7 @@
 #include "opennebula/one_driver.h"
 #endif
 #ifdef WITH_NETWORK
-#include "network_driver.h"
+#include "network/bridge_driver.h"
 #endif
 #ifdef WITH_NETCF
 #include "interface_driver.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index 0586338cba1c5eaf7f0b9aa564957273ffea3d47..97a8c3863ab58e94430419cf51730f3fcfafe2bb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -177,7 +177,7 @@ ESX_DRIVER_SOURCES =                                                \
                esx/esx_vmx.c esx/esx_vmx.h
 
 NETWORK_DRIVER_SOURCES =                                       \
-               network_driver.h network_driver.c
+               network/bridge_driver.h network/bridge_driver.c
 
 INTERFACE_DRIVER_SOURCES =                                     \
                interface_driver.h interface_driver.c

diff --git a/src/network_driver.c b/src/network/bridge_driver.c
similarity index 99%
rename from src/network_driver.c
rename to src/network/bridge_driver.c
index 49855bf010229dcae6c131a4172752554e1287c6..fd3d08f8a2b12790b5de5b459d3c5bbb8b9ab606 100644 (file)
--- a/src/network_driver.c
+++ b/src/network/bridge_driver.c
@@ -46,7 +46,7 @@
 
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "network_driver.h"
+#include "bridge_driver.h"
 #include "network_conf.h"
 #include "driver.h"
 #include "event.h"

diff --git a/src/network_driver.h b/src/network/bridge_driver.h
similarity index 100%
rename from src/network_driver.h
rename to src/network/bridge_driver.h