Move security drivers to src/security/

* src/Makefile.am, src/qemu/qemu_conf.h, src/qemu/qemu_driver.c,
  tests/seclabeltest.c: Adapt for changed paths
* src/security.c: Rename to src/security/security_driver.c
* src/security.h: Rename to src/security/security_driver.h
* src/security_selinux.c, src/security_selinux.h: Move to src/security/

diff --git a/src/Makefile.am b/src/Makefile.am
index 87785925e30e8ee85dc05274a8e0c34127a30eb0..373b2b30f8b7111ee813971268528922f2d973ef 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -219,10 +219,10 @@ STORAGE_HELPER_DISK_SOURCES =                                     \
 
 # Security framework and drivers for various models
 SECURITY_DRIVER_SOURCES =                                      \
-               security.h security.c
+               security/security_driver.h security/security_driver.c
 
 SECURITY_DRIVER_SELINUX_SOURCES =                              \
-               security_selinux.h security_selinux.c
+               security/security_selinux.h security/security_selinux.c
 
 
 NODE_DEVICE_DRIVER_SOURCES =                                   \

diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index ed91d2cd2ad8de6fed3d980234c73651ff3f8fa7..7b35b6d9cf212b17475842d16b38c043af5bfdde 100644 (file)
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -33,7 +33,7 @@
 #include "domain_conf.h"
 #include "domain_event.h"
 #include "threads.h"
-#include "security.h"
+#include "security/security_driver.h"
 #include "cgroup.h"
 #include "pci.h"
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 068b0642f3f2861956b3ece84900d7b0ef999b6b..a1f3c83f0adbc7779282482e49c3896c76d6e6be 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -68,7 +68,7 @@
 #include "node_device_conf.h"
 #include "pci.h"
 #include "hostusb.h"
-#include "security.h"
+#include "security/security_driver.h"
 #include "cgroup.h"
 
 

diff --git a/src/security.c b/src/security/security_driver.c
similarity index 99%
rename from src/security.c
rename to src/security/security_driver.c
index 4138547105577b7b251530299aaf0783e7c1e2c4..f94a2e24737985b9733a6af1cbd26bfa0b1fed42 100644 (file)
--- a/src/security.c
+++ b/src/security/security_driver.c
@@ -15,7 +15,7 @@
 
 #include "virterror_internal.h"
 
-#include "security.h"
+#include "security_driver.h"
 #ifdef WITH_SECDRIVER_SELINUX
 #include "security_selinux.h"
 #endif

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

diff --git a/src/security_selinux.c b/src/security/security_selinux.c
similarity index 99%
rename from src/security_selinux.c
rename to src/security/security_selinux.c
index bc295b1c9ef8f69fdf9942408d7f723f8ab4b31d..b84de8f181c830f8415a24c07b08069c3b8afcc5 100644 (file)
--- a/src/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "security.h"
+#include "security_driver.h"
 #include "security_selinux.h"
 #include "virterror_internal.h"
 #include "util.h"

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

diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c
index fe83db856aaa272ed7ab7c18374427c2dabacd75..26d1f86f90cc1404d8c8ad31e2a00f9efd455bff 100644 (file)
--- a/tests/seclabeltest.c
+++ b/tests/seclabeltest.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "security.h"
+#include "security/security_driver.h"
 
 int
 main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)