From e56c6a83b4aaf2c752cf3ada2aee3079bfe62acc Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Tue, 15 Sep 2009 19:06:37 +0100
Subject: [PATCH] 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/
---
 src/Makefile.am                                | 4 ++--
 src/qemu/qemu_conf.h                           | 2 +-
 src/qemu/qemu_driver.c                         | 2 +-
 src/{security.c => security/security_driver.c} | 2 +-
 src/{security.h => security/security_driver.h} | 0
 src/{ => security}/security_selinux.c          | 2 +-
 src/{ => security}/security_selinux.h          | 0
 tests/seclabeltest.c                           | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/{security.c => security/security_driver.c} (99%)
 rename src/{security.h => security/security_driver.h} (100%)
 rename src/{ => security}/security_selinux.c (99%)
 rename src/{ => security}/security_selinux.h (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 87785925e3..373b2b30f8 100644
--- 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 ed91d2cd2a..7b35b6d9cf 100644
--- 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 068b0642f3..a1f3c83f0a 100644
--- 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 4138547105..f94a2e2473 100644
--- 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 bc295b1c9e..b84de8f181 100644
--- 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 fe83db856a..26d1f86f90 100644
--- 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)