Even more moves.

  include/ui + ui/
  include/qapi/qmp/ + qobject/

Change-Id: Ief236a08cb234d9dd692e85907757678ef32f035

Author: digit-android

Makefile.common

@@ -419,25 +419,16 @@ CORE_MISC_SOURCES = \
     buffered_file.c \
     cbuffer.c \
     charpipe.c \
-    console.c \
-    d3des.c \
     input.c \
     iohandler.c \
     ioport.c \
     net-android.c \
-    path.c \
     qemu-char.c \
-    qemu-config.c \
-    qemu-error.c \
     qemu-malloc.c \
-    qemu-option.c \
-    qemu-sockets-android.c \
-    qerror.c \
     readline.c \
     savevm.c \
     shaper.c \
     tcpdump.c \
-    vnc-android.c \
     android/boot-properties.c \
     android/config.c \
     android/core-init-utils.c   \
@@ -465,12 +456,21 @@ CORE_MISC_SOURCES = \
     android/multitouch-screen.c \
     android/multitouch-port.c \
     android/utils/jpeg-compress.c \
+    qobject/qerror.c \
+    ui/console.c \
+    ui/d3des.c \
+    ui/vnc-android.c \
     util/acl.c \
     util/aes.c \
     util/cutils.c \
     util/module.c \
     util/notify.c \
     util/osdep.c \
+    util/path.c \
+    util/qemu-config.c \
+    util/qemu-error.c \
+    util/qemu-option.c \
+    util/qemu-sockets-android.c \
 
 ifeq ($(HOST_ARCH),x86)
     CORE_MISC_SOURCES += i386-dis.c
@@ -485,7 +485,7 @@ endif
 
 ifeq ($(HOST_OS),linux)
     CORE_MISC_SOURCES += usb-linux.c \
-                         qemu-thread.c \
+                         util/qemu-thread.c \
                          android/camera/camera-capture-linux.c
 else
     CORE_MISC_SOURCES += usb-dummy-android.c
@@ -560,16 +560,16 @@ EMULATOR_LIBQEMU_CFLAGS += -I$(LOCAL_PATH)/telephony
 # integrated into android emulator
 #
 common_LOCAL_SRC_FILES += \
-    json-lexer.c \
-    json-parser.c \
-    json-streamer.c \
-    qjson.c \
-    qbool.c \
-    qdict.c \
-    qfloat.c \
-    qint.c \
-    qlist.c \
-    qstring.c \
+    qobject/json-lexer.c \
+    qobject/json-parser.c \
+    qobject/json-streamer.c \
+    qobject/qjson.c \
+    qobject/qbool.c \
+    qobject/qdict.c \
+    qobject/qfloat.c \
+    qobject/qint.c \
+    qobject/qlist.c \
+    qobject/qstring.c \
 
 ifeq ($(QEMU_TARGET_XML_SOURCES),)
     QEMU_TARGET_XML_SOURCES := arm-core arm-neon arm-vfp arm-vfp3

Makefile.target

@@ -267,9 +267,9 @@ common_LOCAL_SRC_FILES += \
 # What a mess, os-posix.c depends on the exact values of options
 # which are target specific.
 ifeq ($(HOST_OS),windows)
-    common_LOCAL_SRC_FILES += os-win32.c oslib-win32.c
+    common_LOCAL_SRC_FILES += os-win32.c util/oslib-win32.c
 else
-    common_LOCAL_SRC_FILES += os-posix.c oslib-posix.c
+    common_LOCAL_SRC_FILES += os-posix.c util/oslib-posix.c
 endif
 
 

android/display-core.h

@@ -18,7 +18,7 @@
 #ifndef _ANDROID_DISPLAY_CORE_H
 #define _ANDROID_DISPLAY_CORE_H
 
-#include "console.h"
+#include "ui/console.h"
 
 /*
  * Initializes one and only one instance of a core display.

android/display.h

@@ -12,7 +12,7 @@
 #ifndef _ANDROID_DISPLAY_H
 #define _ANDROID_DISPLAY_H
 
-#include "console.h"
+#include "ui/console.h"
 #include "android/framebuffer.h"
 
 extern void android_display_init(DisplayState* ds, QFrameBuffer* qfbuff);

android/main-common.c

@@ -22,7 +22,7 @@
 #include <SDL.h>
 #include <SDL_syswm.h>
 
-#include "console.h"
+#include "ui/console.h"
 
 #include "android/avd/util.h"
 #include "android/utils/debug.h"

android/main.c

@@ -23,7 +23,7 @@
 #include "android/android.h"
 #include "qemu-common.h"
 #include "sysemu.h"
-#include "console.h"
+#include "ui/console.h"
 #include "user-events.h"
 
 #include <SDL.h>

android/protocol/core-commands-proxy.c

@@ -15,7 +15,7 @@
  * part of the UI control protocol. Here we send UI control commands to the Core.
  */
 
-#include "console.h"
+#include "ui/console.h"
 #include "android/looper.h"
 #include "android/async-utils.h"
 #include "android/sync-utils.h"

android/protocol/fb-updates-proxy.c

@@ -15,7 +15,7 @@
  * to the UI connected to the core.
  */
 
-#include "console.h"
+#include "ui/console.h"
 #include "android/looper.h"
 #include "android/display-core.h"
 #include "android/async-utils.h"

android/protocol/user-events-proxy.c

@@ -11,7 +11,7 @@
 */
 
 #include "user-events.h"
-#include "console.h"
+#include "ui/console.h"
 #include "android/looper.h"
 #include "android/async-utils.h"
 #include "android/utils/debug.h"

block.h

@@ -4,7 +4,7 @@
 #include "qemu-aio.h"
 #include "qemu-common.h"
 #include "qemu-option.h"
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
 
 /* block.c */
 typedef struct BlockDriver BlockDriver;

blockdev.c

@@ -10,9 +10,9 @@
 #include "block.h"
 #include "blockdev.h"
 #include "monitor.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu-option.h"
-#include "qemu-config.h"
+#include "qemu/config-file.h"
 #include "sysemu.h"
 
 static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);

curses.c

@@ -34,7 +34,7 @@
 #endif
 
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 
 #define FONT_HEIGHT 16

hw/android_arm.c

@@ -19,7 +19,7 @@
 #include "android/globals.h"
 #include "audio/audio.h"
 #include "arm-misc.h"
-#include "console.h"
+#include "ui/console.h"
 #include "blockdev.h"
 #include "goldfish_pipe.h"
 #ifdef CONFIG_MEMCHECK

hw/goldfish_events_device.c

@@ -16,7 +16,7 @@
 #include "android/multitouch-screen.h"
 #include "irq.h"
 #include "user-events.h"
-#include "console.h"
+#include "ui/console.h"
 
 #define MAX_EVENTS 256*4
 

hw/goldfish_fb.c

@@ -14,7 +14,7 @@
 #include "android/utils/debug.h"
 #include "android/utils/duff.h"
 #include "goldfish_device.h"
-#include "console.h"
+#include "ui/console.h"
 
 /* These values *must* match the platform definitions found under
  * hardware/libhardware/include/hardware/hardware.h

hw/msmouse.c

@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include "../qemu-common.h"
 #include "../qemu-char.h"
-#include "../console.h"
+#include "ui/console.h"
 #include "msmouse.h"
 
 #define MSMOUSE_LO6(n) ((n) & 0x3f)

hw/pc.c

@@ -38,7 +38,7 @@
 //#include "hpet_emul.h"
 #include "watchdog.h"
 #include "smbios.h"
-#include "console.h"
+#include "ui/console.h"
 
 #include "goldfish_device.h"
 #include "goldfish_pipe.h"

hw/ps2.c

@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "ps2.h"
-#include "console.h"
+#include "ui/console.h"
 
 /* debug PC keyboard */
 //#define DEBUG_KBD

hw/usb-hid.c

@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "usb.h"
 
 /* HID interface requests */

hw/usb-msd.c

@@ -11,7 +11,7 @@
 #include "usb.h"
 #include "block.h"
 #include "scsi-disk.h"
-#include "console.h"
+#include "ui/console.h"
 
 //#define DEBUG_MSD
 

qbool.h renamed to include/qapi/qmp/qbool.h

@@ -15,7 +15,7 @@
 #define QBOOL_H
 
 #include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
 
 typedef struct QBool {
     QObject_HEAD;

qerror.h renamed to include/qapi/qmp/qerror.h

@@ -13,8 +13,8 @@
 #define QERROR_H
 
 #include "qdict.h"
-#include "qstring.h"
-#include "qemu-error.h"
+#include "qapi/qmp/qstring.h"
+#include "qemu/error-report.h"
 #include <stdarg.h>
 
 typedef struct QErrorStringTable {

qfloat.h renamed to include/qapi/qmp/qfloat.h

@@ -15,7 +15,7 @@
 #define QFLOAT_H
 
 #include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
 
 typedef struct QFloat {
     QObject_HEAD;

qint.h renamed to include/qapi/qmp/qint.h

@@ -14,7 +14,7 @@
 #define QINT_H
 
 #include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
 
 typedef struct QInt {
     QObject_HEAD;

qjson.h renamed to include/qapi/qmp/qjson.h

@@ -15,8 +15,8 @@
 #define QJSON_H
 
 #include <stdarg.h>
-#include "qobject.h"
-#include "qstring.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qstring.h"
 
 QObject *qobject_from_json(const char *string) GCC_FMT_ATTR(1, 0);
 QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);

qlist.h renamed to include/qapi/qmp/qlist.h

@@ -13,7 +13,7 @@
 #ifndef QLIST_H
 #define QLIST_H
 
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
 #include "qemu-queue.h"
 #include "qemu-common.h"
 

qobject.h renamed to include/qapi/qmp/qobject.h

@@ -14,7 +14,7 @@
 #define QSTRING_H
 
 #include <stdint.h>
-#include "qobject.h"
+#include "qapi/qmp/qobject.h"
 
 typedef struct QString {
     QObject_HEAD;

qstring.h renamed to include/qapi/qmp/qstring.h

@@ -25,8 +25,8 @@
 #include "sysemu.h"
 #include "net.h"
 #include "monitor.h"
-#include "console.h"
-#include "qjson.h"
+#include "ui/console.h"
+#include "qapi/qmp/qjson.h"
 
 #ifdef CONFIG_SKINNING
 QEMUPutMouseEntry *original_qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,

qemu-config.h renamed to include/qemu/config-file.h

@@ -14,8 +14,8 @@
 #ifndef QEMU_JSON_LEXER_H
 #define QEMU_JSON_LEXER_H
 
-#include "qstring.h"
-#include "qlist.h"
+#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/qlist.h"
 
 typedef enum json_token_type {
     JSON_OPERATOR = 100,

qemu-error.h renamed to include/qemu/error-report.h

@@ -15,7 +15,7 @@
 #define QEMU_JSON_PARSER_H
 
 #include "qemu-common.h"
-#include "qlist.h"
+#include "qapi/qmp/qlist.h"
 
 QObject *json_parser_parse(QList *tokens, va_list *ap);
 

console.h renamed to include/ui/console.h

@@ -14,7 +14,7 @@
 #ifndef QEMU_JSON_STREAMER_H
 #define QEMU_JSON_STREAMER_H
 
-#include "qlist.h"
+#include "qapi/qmp/qlist.h"
 #include "json-lexer.h"
 
 typedef struct JSONMessageParser

input.c

@@ -35,7 +35,7 @@
 #include "sysemu.h"
 #include "monitor.h"
 #include "readline.h"
-#include "console.h"
+#include "ui/console.h"
 #include "blockdev.h"
 #include "audio/audio.h"
 #include "disas.h"

json-lexer.h

@@ -3,7 +3,7 @@
 
 #include "qemu-common.h"
 #include "qemu-char.h"
-#include "qerror.h"
+#include "qapi/qmp/qerror.h"
 #include "qdict.h"
 #include "block.h"
 

json-parser.h

@@ -13,8 +13,8 @@
 #ifndef QDICT_H
 #define QDICT_H
 
-#include "qobject.h"
-#include "qlist.h"
+#include "qapi/qmp/qobject.h"
+#include "qapi/qmp/qlist.h"
 #include "qemu-queue.h"
 #include <stdint.h>