Move more stuff to include/qemu/ and util/

digit-android · digit-android · commit e90d665cd63a · 2014-01-08T07:21:09.000+01:00
Change-Id: I3d10ae4d5b050f7da565476e2c0f6be5d3348f5d
diff --git a/Makefile.common b/Makefile.common
@@ -420,14 +420,11 @@ CORE_MISC_SOURCES = \
     cbuffer.c \
     charpipe.c \
     console.c \
-    cutils.c \
     d3des.c \
     input.c \
     iohandler.c \
     ioport.c \
-    module.c \
     net-android.c \
-    notify.c \
     path.c \
     qemu-char.c \
     qemu-config.c \
@@ -470,6 +467,9 @@ CORE_MISC_SOURCES = \
     android/utils/jpeg-compress.c \
     util/acl.c \
     util/aes.c \
+    util/cutils.c \
+    util/module.c \
+    util/notify.c \
     util/osdep.c \
 
 ifeq ($(HOST_ARCH),x86)
diff --git a/audio/ossaudio.c b/audio/ossaudio.c
@@ -31,7 +31,7 @@
 #include <sys/soundcard.h>
 #endif
 #include "qemu-common.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 #include "qemu-char.h"
 #include "audio.h"
 
diff --git a/block.c b/block.c
@@ -25,7 +25,7 @@
 #include "qemu-common.h"
 #include "monitor.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 #include "qemu-objects.h"
 
 #ifdef CONFIG_BSD
diff --git a/block/bochs.c b/block/bochs.c
@@ -24,7 +24,7 @@
  */
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 
 /**************************************************************/
 
diff --git a/block/cloop.c b/block/cloop.c
@@ -23,7 +23,7 @@
  */
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 #include <zlib.h>
 
 typedef struct BDRVCloopState {
diff --git a/block/cow.c b/block/cow.c
@@ -23,7 +23,7 @@
  */
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 
 /**************************************************************/
 /* COW block driver using file system holes */
diff --git a/block/dmg.c b/block/dmg.c
@@ -24,7 +24,7 @@
 #include "qemu-common.h"
 #include "block_int.h"
 #include "qemu/bswap.h"
-#include "module.h"
+#include "qemu/module.h"
 #include <zlib.h>
 
 typedef struct BDRVDMGState {
diff --git a/block/nbd.c b/block/nbd.c
@@ -28,7 +28,7 @@
 
 #include "qemu-common.h"
 #include "nbd.h"
-#include "module.h"
+#include "qemu/module.h"
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/block/parallels.c b/block/parallels.c
@@ -25,7 +25,7 @@
  */
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 
 /**************************************************************/
 
diff --git a/block/qcow.c b/block/qcow.c
@@ -23,7 +23,7 @@
  */
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 #include <zlib.h>
 #include "qemu/aes.h"
 
diff --git a/block/qcow2.c b/block/qcow2.c
@@ -23,7 +23,7 @@
  */
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 #include <zlib.h>
 #include "qemu/aes.h"
 #include "block/qcow2.h"
diff --git a/block/raw-posix.c b/block/raw-posix.c
@@ -26,7 +26,7 @@
 #include "qemu-char.h"
 #include "qemu-log.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 #include "block/raw-posix-aio.h"
 
 #ifdef CONFIG_COCOA
diff --git a/block/raw-win32.c b/block/raw-win32.c
@@ -24,7 +24,7 @@
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 #include <windows.h>
 #include <winioctl.h>
 
diff --git a/block/raw.c b/block/raw.c
@@ -1,7 +1,7 @@
 
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 
 static int raw_open(BlockDriverState *bs, int flags)
 {
diff --git a/block/vmdk.c b/block/vmdk.c
@@ -25,7 +25,7 @@
 
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 
 #define VMDK3_MAGIC (('C' << 24) | ('O' << 16) | ('W' << 8) | 'D')
 #define VMDK4_MAGIC (('K' << 24) | ('D' << 16) | ('M' << 8) | 'V')
diff --git a/block/vpc.c b/block/vpc.c
@@ -24,7 +24,7 @@
  */
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 
 /**************************************************************/
 
diff --git a/block/vvfat.c b/block/vvfat.c
@@ -26,7 +26,7 @@
 #include <dirent.h>
 #include "qemu-common.h"
 #include "block_int.h"
-#include "module.h"
+#include "qemu/module.h"
 
 #ifndef S_IWGRP
 #define S_IWGRP 0
diff --git a/console.h b/console.h
@@ -3,7 +3,7 @@
 
 #include "qemu-char.h"
 #include "qdict.h"
-#include "notify.h"
+#include "qemu/notify.h"
 
 /* keyboard/mouse support */
 
diff --git a/hw/apic.c b/hw/apic.c
@@ -20,7 +20,7 @@
 #include "hw.h"
 #include "pc.h"
 #include "qemu/timer.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 
 //#define DEBUG_APIC
 
diff --git a/hw/ioapic.c b/hw/ioapic.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "pc.h"
 #include "qemu/timer.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 
 //#define DEBUG_IOAPIC
 
diff --git a/include/qemu/compatfd.h b/include/qemu/compatfd.h
diff --git a/include/qemu/envlist.h b/include/qemu/envlist.h
diff --git a/include/qemu/host-utils.h b/include/qemu/host-utils.h
diff --git a/include/qemu/module.h b/include/qemu/module.h
diff --git a/include/qemu/notify.h b/include/qemu/notify.h
diff --git a/qemu-common.h b/qemu-common.h
@@ -384,7 +384,7 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)
     return res.ll;
 }
 
-#include "module.h"
+#include "qemu/module.h"
 
 typedef enum DisplayType
 {
diff --git a/target-arm/helper.c b/target-arm/helper.c
@@ -7,7 +7,7 @@
 #include "gdbstub.h"
 #include "helper.h"
 #include "qemu-common.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 #if !defined(CONFIG_USER_ONLY)
 //#include "hw/loader.h"
 #ifdef CONFIG_TRACE
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
@@ -20,7 +20,7 @@
 #define CPU_NO_GLOBAL_REGS
 #include "exec.h"
 #include "exec-all.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 
 //#define DEBUG_PCALL
 
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include "exec.h"
 
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 
 #include "helper.h"
 /*****************************************************************************/
diff --git a/tcg/tcg.c b/tcg/tcg.c
@@ -46,7 +46,7 @@
 
 #include "qemu-common.h"
 #include "qemu/cache-utils.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 #include "qemu/timer.h"
 
 /* Note: the long term plan is to reduce the dependancies on the QEMU
diff --git a/util/compatfd.c b/util/compatfd.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu-common.h"
-#include "compatfd.h"
+#include "qemu/compatfd.h"
 
 #include <sys/syscall.h>
 #include <pthread.h>
diff --git a/util/cutils.c b/util/cutils.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 #include <math.h>
 
 void pstrcpy(char *buf, int buf_size, const char *str)
diff --git a/util/envlist.c b/util/envlist.c
@@ -5,7 +5,7 @@
 #include <unistd.h>
 
 #include "qemu-queue.h"
-#include "envlist.h"
+#include "qemu/envlist.h"
 
 struct envlist_entry {
 	const char *ev_var;			/* actual env value */
diff --git a/util/host-utils.c b/util/host-utils.c
@@ -25,7 +25,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include "host-utils.h"
+#include "qemu/host-utils.h"
 
 //#define DEBUG_MULDIV
 
diff --git a/util/module.c b/util/module.c
@@ -13,7 +13,7 @@
 
 #include "qemu-common.h"
 #include "qemu-queue.h"
-#include "module.h"
+#include "qemu/module.h"
 
 typedef struct ModuleEntry
 {
diff --git a/util/notify.c b/util/notify.c
@@ -12,7 +12,7 @@
  */
 
 #include "qemu-common.h"
-#include "notify.h"
+#include "qemu/notify.h"
 
 void notifier_list_init(NotifierList *list)
 {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`#include "qemu-common.h"`
`3`	`3`	`#include "block_int.h"`
`4`		`-#include "module.h"`
	`4`	`+#include "qemu/module.h"`
`5`	`5`
`6`	`6`	`static int raw_open(BlockDriverState *bs, int flags)`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ static inline uint64_t muldiv64(uint64_t a, uint32_t b, uint32_t c)`
`384`	`384`	`return res.ll;`
`385`	`385`	`}`
`386`	`386`
`387`		`-#include "module.h"`
	`387`	`+#include "qemu/module.h"`
`388`	`388`
`389`	`389`	`typedef enum DisplayType`
`390`	`390`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`#include "qemu-common.h"`
`15`	`15`	`#include "qemu-queue.h"`
`16`		`-#include "module.h"`
	`16`	`+#include "qemu/module.h"`
`17`	`17`
`18`	`18`	`typedef struct ModuleEntry`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*/`
`13`	`13`
`14`	`14`	`#include "qemu-common.h"`
`15`		`-#include "notify.h"`
	`15`	`+#include "qemu/notify.h"`
`16`	`16`
`17`	`17`	`void notifier_list_init(NotifierList *list)`
`18`	`18`	`{`