Move osdeps.h to include/qemu/osdep.h
and osdep.c to util/osdep.c
Change-Id: Icaf5cd7dfc8f75cbe7eb324cc9ca91a976f35d57
diff --git a/Makefile.common b/Makefile.common
index e24dd33..e3f979e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -430,7 +430,6 @@
module.c \
net-android.c \
notify.c \
- osdep.c \
path.c \
qemu-char.c \
qemu-config.c \
@@ -470,7 +469,8 @@
android/snaphost-android.c \
android/multitouch-screen.c \
android/multitouch-port.c \
- android/utils/jpeg-compress.c
+ android/utils/jpeg-compress.c \
+ util/osdep.c \
ifeq ($(HOST_ARCH),x86)
CORE_MISC_SOURCES += i386-dis.c
diff --git a/android/utils/ini.c b/android/utils/ini.c
index 43f1321..2bb6dbc 100644
--- a/android/utils/ini.c
+++ b/android/utils/ini.c
@@ -18,7 +18,7 @@
#include "android/utils/debug.h"
#include "android/utils/system.h" /* for ASTRDUP */
#include "android/utils/bufprint.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
/* W() is used to print warnings, D() to print debugging info */
#define W(...) dwarning(__VA_ARGS__)
diff --git a/cpu-defs.h b/cpu-defs.h
index 000e86e..e5969bf 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -27,7 +27,7 @@
#include <setjmp.h>
#include <inttypes.h>
#include <signal.h>
-#include "osdep.h"
+#include "qemu/osdep.h"
#include "qemu-queue.h"
#include "targphys.h"
diff --git a/exec.c b/exec.c
index bf7dc0f..2fd4f55 100644
--- a/exec.c
+++ b/exec.c
@@ -37,7 +37,7 @@
#include "qemu-common.h"
#include "tcg.h"
#include "hw/hw.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
#include "kvm.h"
#include "hax.h"
#include "qemu-timer.h"
diff --git a/host-utils.h b/host-utils.h
index 0ddc176..7ff1617 100644
--- a/host-utils.h
+++ b/host-utils.h
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
-#include "osdep.h"
+#include "qemu/osdep.h"
#if defined(__x86_64__)
#define __HAVE_FAST_MULU64__
diff --git a/osdep.h b/include/qemu/osdep.h
similarity index 100%
rename from osdep.h
rename to include/qemu/osdep.h
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index e1c58d0..08cc18c 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -23,7 +23,7 @@
#include <stdio.h>
#include "qemu-queue.h"
-#include "osdep.h"
+#include "qemu/osdep.h"
#include "sysemu.h"
#include "qemu-common.h"
#include "block_int.h"
diff --git a/qemu-common.h b/qemu-common.h
index f000c6e..d0185fa 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -121,7 +121,7 @@
#ifndef NEED_CPU_H
#include <setjmp.h>
-#include "osdep.h"
+#include "qemu/osdep.h"
#include "qemu/bswap.h"
#else
diff --git a/slirp-android/ip_input.c b/slirp-android/ip_input.c
index aa6a6d5..e9597fd 100644
--- a/slirp-android/ip_input.c
+++ b/slirp-android/ip_input.c
@@ -39,7 +39,7 @@
*/
#include <slirp.h>
-#include <osdep.h>
+#include <qemu/osdep.h>
#include "ip_icmp.h"
#ifdef LOG_ENABLED
diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index c37412e..77cef7c 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -39,7 +39,7 @@
*/
#include <slirp.h>
-#include <osdep.h>
+#include <qemu/osdep.h>
#include "ip_icmp.h"
#ifdef LOG_ENABLED
diff --git a/osdep.c b/util/osdep.c
similarity index 100%
rename from osdep.c
rename to util/osdep.c
