Move more files to include/qemu/ and util/

Change-Id: I79e70241894e8bbeea2de711ff9de742583c23b1

Author: digit-android

Makefile.common

@@ -412,8 +412,6 @@ endif
 # misc. sources
 #
 CORE_MISC_SOURCES = \
-    acl.c \
-    aes.c \
     aio-android.c \
     async.c \
     bt-host.c \
@@ -470,6 +468,8 @@ CORE_MISC_SOURCES = \
     android/multitouch-screen.c \
     android/multitouch-port.c \
     android/utils/jpeg-compress.c \
+    util/acl.c \
+    util/aes.c \
     util/osdep.c \
 
 ifeq ($(HOST_ARCH),x86)
@@ -480,7 +480,7 @@ ifeq ($(HOST_ARCH),x86_64)
 endif
 ifeq ($(HOST_ARCH),ppc)
     CORE_MISC_SOURCES += ppc-dis.c \
-                         cache-utils.c
+                         util/cache-utils.c
 endif
 
 ifeq ($(HOST_OS),linux)

block/qcow.c

@@ -25,7 +25,7 @@
 #include "block_int.h"
 #include "module.h"
 #include <zlib.h>
-#include "aes.h"
+#include "qemu/aes.h"
 
 /**************************************************************/
 /* QEMU COW block driver with compression and encryption support */

block/qcow2.c

@@ -25,7 +25,7 @@
 #include "block_int.h"
 #include "module.h"
 #include <zlib.h>
-#include "aes.h"
+#include "qemu/aes.h"
 #include "block/qcow2.h"
 
 /*

block/qcow2.h

@@ -25,7 +25,7 @@
 #ifndef BLOCK_QCOW2_H
 #define BLOCK_QCOW2_H
 
-#include "aes.h"
+#include "qemu/aes.h"
 
 //#define DEBUG_ALLOC
 //#define DEBUG_ALLOC2

acl.h renamed to include/qemu/acl.h

@@ -43,7 +43,7 @@
 #include "qemu/timer.h"
 #include "migration.h"
 #include "kvm.h"
-#include "acl.h"
+#include "qemu/acl.h"
 #include "exec-all.h"
 
 //#define DEBUG

aes.h renamed to include/qemu/aes.h

@@ -45,7 +45,7 @@
 #endif
 
 #include "qemu-common.h"
-#include "cache-utils.h"
+#include "qemu/cache-utils.h"
 #include "host-utils.h"
 #include "qemu/timer.h"
 

cache-utils.h renamed to include/qemu/cache-utils.h

@@ -24,7 +24,7 @@
 
 
 #include "qemu-common.h"
-#include "acl.h"
+#include "qemu/acl.h"
 
 #ifdef CONFIG_FNMATCH
 #include <fnmatch.h>

monitor.c

@@ -28,7 +28,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "qemu-common.h"
-#include "aes.h"
+#include "qemu/aes.h"
 
 #ifndef NDEBUG
 #define NDEBUG

tcg/tcg.c

@@ -1,4 +1,4 @@
-#include "cache-utils.h"
+#include "qemu/cache-utils.h"
 
 #if defined(_ARCH_PPC)
 struct qemu_cache_conf qemu_cache_conf = {

acl.c renamed to util/acl.c

@@ -194,7 +194,7 @@ int qemu_main(int argc, char **argv, char **envp);
 #include "gdbstub.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
-#include "cache-utils.h"
+#include "qemu/cache-utils.h"
 #include "block.h"
 #include "dma.h"
 #include "audio/audio.h"

aes.c renamed to util/aes.c

@@ -152,7 +152,7 @@ int qemu_main(int argc, char **argv, char **envp);
 #include "gdbstub.h"
 #include "qemu/timer.h"
 #include "qemu-char.h"
-#include "cache-utils.h"
+#include "qemu/cache-utils.h"
 #include "block.h"
 #include "dma.h"
 #include "audio/audio.h"

cache-utils.c renamed to util/cache-utils.c

@@ -28,7 +28,7 @@
 #include "sysemu.h"
 #include "qemu_socket.h"
 #include "qemu/timer.h"
-#include "acl.h"
+#include "qemu/acl.h"
 
 #define VNC_REFRESH_INTERVAL (1000 / 30)
 

vl-android.c

@@ -31,7 +31,7 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
-#include "acl.h"
+#include "qemu/acl.h"
 
 enum {
     VNC_WIREMODE_CLEAR,

vl.c

@@ -28,7 +28,7 @@
 #include "sysemu.h"
 #include "qemu_socket.h"
 #include "qemu/timer.h"
-#include "acl.h"
+#include "qemu/acl.h"
 
 #define VNC_REFRESH_INTERVAL (1000 / 30)