Move more files to include/qemu/ and util/
Change-Id: I79e70241894e8bbeea2de711ff9de742583c23b1
diff --git a/Makefile.common b/Makefile.common
index e3f979e..e5a20e6 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -412,8 +412,6 @@
# misc. sources
#
CORE_MISC_SOURCES = \
- acl.c \
- aes.c \
aio-android.c \
async.c \
bt-host.c \
@@ -470,6 +468,8 @@
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 @@
endif
ifeq ($(HOST_ARCH),ppc)
CORE_MISC_SOURCES += ppc-dis.c \
- cache-utils.c
+ util/cache-utils.c
endif
ifeq ($(HOST_OS),linux)
diff --git a/block/qcow.c b/block/qcow.c
index 816103d..40bb7bc 100644
--- a/block/qcow.c
+++ b/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 */
diff --git a/block/qcow2.c b/block/qcow2.c
index a53014d..9a4a2e2 100644
--- a/block/qcow2.c
+++ b/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"
/*
diff --git a/block/qcow2.h b/block/qcow2.h
index 3ff162e..fbf3625 100644
--- a/block/qcow2.h
+++ b/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
diff --git a/acl.h b/include/qemu/acl.h
similarity index 100%
rename from acl.h
rename to include/qemu/acl.h
diff --git a/aes.h b/include/qemu/aes.h
similarity index 100%
rename from aes.h
rename to include/qemu/aes.h
diff --git a/cache-utils.h b/include/qemu/cache-utils.h
similarity index 100%
rename from cache-utils.h
rename to include/qemu/cache-utils.h
diff --git a/monitor.c b/monitor.c
index 7e39dcb..9da86a1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -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
diff --git a/tcg/tcg.c b/tcg/tcg.c
index ff592dd..8458370 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -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"
diff --git a/acl.c b/util/acl.c
similarity index 99%
rename from acl.c
rename to util/acl.c
index 82c2704..1b4238a 100644
--- a/acl.c
+++ b/util/acl.c
@@ -24,7 +24,7 @@
#include "qemu-common.h"
-#include "acl.h"
+#include "qemu/acl.h"
#ifdef CONFIG_FNMATCH
#include <fnmatch.h>
diff --git a/aes.c b/util/aes.c
similarity index 99%
rename from aes.c
rename to util/aes.c
index eb37adb..54c7b98 100644
--- a/aes.c
+++ b/util/aes.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
diff --git a/cache-utils.c b/util/cache-utils.c
similarity index 98%
rename from cache-utils.c
rename to util/cache-utils.c
index b1f2097..b95cd8d 100644
--- a/cache-utils.c
+++ b/util/cache-utils.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 = {
diff --git a/vl-android.c b/vl-android.c
index 4258a49..c519cd2 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -194,7 +194,7 @@
#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"
diff --git a/vl.c b/vl.c
index d7f7138..4bcb145 100644
--- a/vl.c
+++ b/vl.c
@@ -152,7 +152,7 @@
#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"
diff --git a/vnc-android.c b/vnc-android.c
index 82cc7ab..2a7acc1 100644
--- a/vnc-android.c
+++ b/vnc-android.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)
diff --git a/vnc-tls.h b/vnc-tls.h
index 2b93633..36a2227 100644
--- a/vnc-tls.h
+++ b/vnc-tls.h
@@ -31,7 +31,7 @@
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
-#include "acl.h"
+#include "qemu/acl.h"
enum {
VNC_WIREMODE_CLEAR,
diff --git a/vnc.c b/vnc.c
index 67ab985..f71bd46 100644
--- a/vnc.c
+++ b/vnc.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)