ui: move files to ui/ and include/ui/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/Makefile.objs b/Makefile.objs
index fe78836fcbbc0ce76679b5c7643c1059e3f6e195..a637a4a8f0adefe151f519a86f78b527598d11d6 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -68,8 +68,7 @@ endif
 common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
 common-obj-y += net/
 common-obj-y += qom/
-common-obj-y += readline.o console.o cursor.o
-common-obj-y += qemu-pixman.o
+common-obj-y += readline.o
 common-obj-y += $(oslib-obj-y)
 common-obj-$(CONFIG_WIN32) += os-win32.o
 common-obj-$(CONFIG_POSIX) += os-posix.o
@@ -78,7 +77,6 @@ common-obj-$(CONFIG_LINUX) += fsdev/
 extra-obj-$(CONFIG_LINUX) += fsdev/
 
 common-obj-y += tcg-runtime.o host-utils.o main-loop.o
-common-obj-y += input.o
 common-obj-y += buffered_file.o migration.o migration-tcp.o
 common-obj-y += qemu-char.o #aio.o
 common-obj-y += block-migration.o iohandler.o

diff --git a/hmp.c b/hmp.c
index 9b31e9f8a784ce63390691c5877ecfbe1d5d2af2..f235134bb6d429d1095f6f1235f85d56618d3bdb 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -21,7 +21,7 @@
 #include "qmp-commands.h"
 #include "qemu_socket.h"
 #include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
 
 static void hmp_handle_error(Monitor *mon, Error **errp)
 {

diff --git a/hw/adb.c b/hw/adb.c
index 3b547f0af7767a1d1272a84ab854b8618efbcdf5..cc8ad8e0572fac0285416eee82efe32e6db38a17 100644 (file)
--- a/hw/adb.c
+++ b/hw/adb.c
@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "adb.h"
-#include "console.h"
+#include "ui/console.h"
 
 /* debug ADB */
 //#define DEBUG_ADB

diff --git a/hw/ads7846.c b/hw/ads7846.c
index 2ea9e55bb5ef2057ee3cae66ed3711da665dd028..fa137e628e631c1373b51dad8b29bcfbf1b9cc61 100644 (file)
--- a/hw/ads7846.c
+++ b/hw/ads7846.c
@@ -11,7 +11,7 @@
  */
 
 #include "ssi.h"
-#include "console.h"
+#include "ui/console.h"
 
 typedef struct {
     SSISlave ssidev;

diff --git a/hw/applesmc.c b/hw/applesmc.c
index 8bedaad3108fb13ec2099d6240e791b4ccd81ecf..91e7cb3d5c53ebd674da35ff1243f2ea55412136 100644 (file)
--- a/hw/applesmc.c
+++ b/hw/applesmc.c
@@ -32,7 +32,7 @@
 
 #include "hw.h"
 #include "isa.h"
-#include "console.h"
+#include "ui/console.h"
 #include "qemu-timer.h"
 
 /* #define DEBUG_SMC */

diff --git a/hw/blizzard.c b/hw/blizzard.c
index 1b57eb5396370f4d09f25cc4b72e268459c380d8..24bde32e5afbc892cd8e79e1aa2df5017a913cdd 100644 (file)
--- a/hw/blizzard.c
+++ b/hw/blizzard.c
@@ -19,10 +19,10 @@
  */
 
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 #include "devices.h"
 #include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
 
 typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int);
 

diff --git a/hw/bt-hid.c b/hw/bt-hid.c
index 8d7a3dae219d20756946e79c5eb62e6595aebcdc..0ec0c013b061b0521e7f6bdd601acbc7693ad055 100644 (file)
--- a/hw/bt-hid.c
+++ b/hw/bt-hid.c
@@ -20,7 +20,7 @@
 
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
 #include "hid.h"
 #include "bt.h"
 

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 7d021f2e1d1a96c9dc0cf027b7ced52a21e2f800..80510bc9af83b667aee8f9aedaf604ff7b5dc627 100644 (file)
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -28,7 +28,7 @@
  */
 #include "hw.h"
 #include "pci/pci.h"
-#include "console.h"
+#include "ui/console.h"
 #include "vga_int.h"
 #include "loader.h"
 

diff --git a/hw/escc.c b/hw/escc.c
index a356613b063c4c3e257ef1ed76a9181c3c5f56dd..38e8164e44cd3188efcc064c616b7d993cc2b234 100644 (file)
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -26,7 +26,7 @@
 #include "sysbus.h"
 #include "escc.h"
 #include "qemu-char.h"
-#include "console.h"
+#include "ui/console.h"
 #include "trace.h"
 
 /*

diff --git a/hw/exynos4210_fimd.c b/hw/exynos4210_fimd.c
index f2443ca4afcb92ddc510e5eb1ee6cd6f6b0b93ce..3ef0847271d1ac6b259dd57ff5859d55902867d0 100644 (file)
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -25,8 +25,8 @@
 #include "qemu-common.h"
 #include "cpu-all.h"
 #include "sysbus.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/pixel_ops.h"
 #include "bswap.h"
 
 /* Debug messages configuration */

diff --git a/hw/framebuffer.c b/hw/framebuffer.c
index fa0f7863c4197b7649c553a99356912f2ad711bb..2a870961bc965155de650e81773c21a272a60648 100644 (file)
--- a/hw/framebuffer.c
+++ b/hw/framebuffer.c
@@ -18,7 +18,7 @@
  */
 
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "framebuffer.h"
 
 /* Render an image from a shared memory framebuffer.  */

diff --git a/hw/g364fb.c b/hw/g364fb.c
index 8192baf1c8df31b97cd8fc09556951f6af276e6f..b46a04460787b82b66b7b24c1026068e25f7ca8f 100644 (file)
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -18,8 +18,8 @@
  */
 
 #include "hw.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/pixel_ops.h"
 #include "trace.h"
 #include "sysbus.h"
 

diff --git a/hw/hid.c b/hw/hid.c
index 03761ab8b8ec591305300e07ead26ca10aaa8f86..7935998e83872700f79b31b868964516ceed334a 100644 (file)
--- a/hw/hid.c
+++ b/hw/hid.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "qemu-timer.h"
 #include "hid.h"
 

diff --git a/hw/hpet.c b/hw/hpet.c
index 50ac067ecef40f66c9884997b75ddaacc92c13e4..49e1b631b5f52370cee9785d11568ee97a5a84a7 100644 (file)
--- a/hw/hpet.c
+++ b/hw/hpet.c
@@ -26,7 +26,7 @@
 
 #include "hw.h"
 #include "pc.h"
-#include "console.h"
+#include "ui/console.h"
 #include "qemu-timer.h"
 #include "hpet_emul.h"
 #include "sysbus.h"

diff --git a/hw/jazz_led.c b/hw/jazz_led.c
index 09c77429e85364c27ba1740067ac3b932d215a6a..f4a040631e3b7ce000adb5ac0adb77cd0067f77b 100644 (file)
--- a/hw/jazz_led.c
+++ b/hw/jazz_led.c
@@ -23,8 +23,8 @@
  */
 
 #include "qemu-common.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/pixel_ops.h"
 #include "trace.h"
 #include "sysbus.h"
 

diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index 42291592e3cae07d95535cf628701e435f4730c7..2629775589fad923982772a09a4b280d3c6493d3 100644 (file)
--- a/hw/kvm/pci-assign.c
+++ b/hw/kvm/pci-assign.c
@@ -29,7 +29,7 @@
 #include "hw/hw.h"
 #include "hw/pc.h"
 #include "qemu-error.h"
-#include "console.h"
+#include "ui/console.h"
 #include "hw/loader.h"
 #include "monitor.h"
 #include "range.h"

diff --git a/hw/lm832x.c b/hw/lm832x.c
index 8e09f9bcc9643a64cfdd614b764d96e2f0329c9b..b14a089b3222239f450de37e62b240b8663e961e 100644 (file)
--- a/hw/lm832x.c
+++ b/hw/lm832x.c
@@ -21,7 +21,7 @@
 #include "hw.h"
 #include "i2c.h"
 #include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
 
 typedef struct {
     I2CSlave i2c;

diff --git a/hw/milkymist-softusb.c b/hw/milkymist-softusb.c
index b162b88db7a3441b33834740b14b958045688880..0743668d185514162acf27d9da566e2e1a81687c 100644 (file)
--- a/hw/milkymist-softusb.c
+++ b/hw/milkymist-softusb.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "sysbus.h"
 #include "trace.h"
-#include "console.h"
+#include "ui/console.h"
 #include "hid.h"
 #include "qemu-error.h"
 

diff --git a/hw/milkymist-vgafb.c b/hw/milkymist-vgafb.c
index 833881cc6a0d766d38f8a375c68b7b82eb201989..c3471315d312fc7b7ae23fbb3d0a08dac4cf4eb7 100644 (file)
--- a/hw/milkymist-vgafb.c
+++ b/hw/milkymist-vgafb.c
@@ -25,9 +25,9 @@
 #include "hw.h"
 #include "sysbus.h"
 #include "trace.h"
-#include "console.h"
+#include "ui/console.h"
 #include "framebuffer.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
 #include "qemu-error.h"
 
 #define BITS 8

diff --git a/hw/msmouse.c b/hw/msmouse.c
index 9c492a4637109cc3614599755ef1e3c1978bc757..decb1a3b5db7336fc3d6205dfeaa4805dc42149e 100644 (file)
--- a/hw/msmouse.c
+++ b/hw/msmouse.c
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 #include <stdlib.h>
-#include "../qemu-common.h"
-#include "../qemu-char.h"
-#include "../console.h"
+#include "qemu-common.h"
+#include "qemu-char.h"
+#include "ui/console.h"
 #include "msmouse.h"
 
 #define MSMOUSE_LO6(n) ((n) & 0x3f)

diff --git a/hw/musicpal.c b/hw/musicpal.c
index 4e8399ab636e0da58c4376906642c64f0687a014..d16cd141a251028a6e69e1cb0193732585d6c27a 100644 (file)
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -20,10 +20,11 @@
 #include "ptimer.h"
 #include "block.h"
 #include "flash.h"
-#include "console.h"
+#include "ui/console.h"
 #include "i2c.h"
 #include "blockdev.h"
 #include "exec-memory.h"
+#include "ui/pixel_ops.h"
 
 #define MP_MISC_BASE            0x80002000
 #define MP_MISC_SIZE            0x00001000
@@ -492,8 +493,6 @@ SET_LCD_PIXEL(8, uint8_t)
 SET_LCD_PIXEL(16, uint16_t)
 SET_LCD_PIXEL(32, uint32_t)
 
-#include "pixel_ops.h"
-
 static void lcd_refresh(void *opaque)
 {
     musicpal_lcd_state *s = opaque;

diff --git a/hw/nseries.c b/hw/nseries.c
index 2de8d21f08ff9cc4887c9be46c6c99ae8f04175e..dcd3dc97d0147502c398f2f9eb6b04862d80ffe8 100644 (file)
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -23,7 +23,7 @@
 #include "omap.h"
 #include "arm-misc.h"
 #include "irq.h"
-#include "console.h"
+#include "ui/console.h"
 #include "boards.h"
 #include "i2c.h"
 #include "devices.h"

diff --git a/hw/omap_dss.c b/hw/omap_dss.c
index 1e83726d3b70f00c14a9a0dc95e1eeba2edc533c..ae51bdfe4114de69177c95e99fc4a1428e416a50 100644 (file)
--- a/hw/omap_dss.c
+++ b/hw/omap_dss.c
@@ -18,7 +18,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "omap.h"
 
 struct omap_dss_s {

diff --git a/hw/omap_lcdc.c b/hw/omap_lcdc.c
index d7ae3032be2b43047192e6cf9ab3908d18326408..936850a6216ba6f3938d045795c168f4e8af45e1 100644 (file)
--- a/hw/omap_lcdc.c
+++ b/hw/omap_lcdc.c
@@ -17,9 +17,10 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "omap.h"
 #include "framebuffer.h"
+#include "ui/pixel_ops.h"
 
 struct omap_lcd_panel_s {
     MemoryRegion *sysmem;
@@ -66,8 +67,6 @@ static void omap_lcd_interrupts(struct omap_lcd_panel_s *s)
     qemu_irq_lower(s->irq);
 }
 
-#include "pixel_ops.h"
-
 #define draw_line_func drawfn
 
 #define DEPTH 8

diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 21a5bbb0067340f0dcf122a407f75b489647a383..918a6f6a045c1604b7e2ed441051390990788e58 100644 (file)
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -26,7 +26,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "omap.h"
 #include "boards.h"
 #include "arm-misc.h"

diff --git a/hw/palm.c b/hw/palm.c
index 6f6f414e6e6002f0cb91e9b6ff7ee56a25e46cb1..5aaeb07460ba3b43d9038f113152cc9dd83b88ad 100644 (file)
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -19,7 +19,7 @@
 #include "hw.h"
 #include "audio/audio.h"
 #include "sysemu.h"
-#include "console.h"
+#include "ui/console.h"
 #include "omap.h"
 #include "boards.h"
 #include "arm-misc.h"

diff --git a/hw/pl110.c b/hw/pl110.c
index f869ba60d74911728062a0bac9535277bffe2530..098e335aeab12890267439bdbb46e52d62639163 100644 (file)
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -8,8 +8,9 @@
  */
 
 #include "sysbus.h"
-#include "console.h"
+#include "ui/console.h"
 #include "framebuffer.h"
+#include "ui/pixel_ops.h"
 
 #define PL110_CR_EN   0x001
 #define PL110_CR_BGR  0x100
@@ -109,8 +110,6 @@ static const unsigned char *idregs[] = {
     pl111_id
 };
 
-#include "pixel_ops.h"
-
 #define BITS 8
 #include "pl110_template.h"
 #define BITS 15

diff --git a/hw/ps2.c b/hw/ps2.c
index f93cd24d94d5cfa7026c85747bd5c49c57cd891a..ba80089aba8a3868090bacb1a70436c2fab0c8ab 100644 (file)
--- a/hw/ps2.c
+++ b/hw/ps2.c
@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "ps2.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 
 /* debug PC keyboard */

diff --git a/hw/puv3.c b/hw/puv3.c
index 6f89c44e328635757270de28f34c86bb3c4e789d..9f8e294ad504818ad5d40ac770a09dbf9f999a22 100644 (file)
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -10,7 +10,7 @@
  */
 
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 #include "elf.h"
 #include "exec-memory.h"
 #include "sysbus.h"

diff --git a/hw/pxa2xx_keypad.c b/hw/pxa2xx_keypad.c
index 257984c427faa0ab593b6fbf65335b667cc358fa..4ff04ad63b3452e707808a3ab9c0e6510ddd08ed 100644 (file)
--- a/hw/pxa2xx_keypad.c
+++ b/hw/pxa2xx_keypad.c
@@ -13,7 +13,7 @@
 
 #include "hw.h"
 #include "pxa.h"
-#include "console.h"
+#include "ui/console.h"
 
 /*
  * Keypad

diff --git a/hw/pxa2xx_lcd.c b/hw/pxa2xx_lcd.c
index b53dfaf3cf8827c2d0097713707e9b372f291452..b5efd4d426b564ae60cb93c572b425365aa73066 100644 (file)
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -11,9 +11,9 @@
  */
 
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "pxa.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
 /* FIXME: For graphic_rotate. Should probably be done in common code.  */
 #include "sysemu.h"
 #include "framebuffer.h"

diff --git a/hw/qxl.h b/hw/qxl.h
index 41246c75540d32bd68f904bf19d93c2f54323a10..8433d1aeeaeeba3824013713e4de2790e7cbb868 100644 (file)
--- a/hw/qxl.h
+++ b/hw/qxl.h
@@ -1,6 +1,6 @@
 #include "qemu-common.h"
 
-#include "console.h"
+#include "ui/console.h"
 #include "hw.h"
 #include "pci/pci.h"
 #include "vga_int.h"

diff --git a/hw/sm501.c b/hw/sm501.c
index 50324cda53bcc7bec607e3d0e9641acc66071296..714aca0492e39b2be6beb13a45704d7237ebda3f 100644 (file)
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -25,11 +25,12 @@
 #include <stdio.h>
 #include "hw.h"
 #include "serial.h"
-#include "console.h"
+#include "ui/console.h"
 #include "devices.h"
 #include "sysbus.h"
 #include "qdev-addr.h"
 #include "range.h"
+#include "ui/pixel_ops.h"
 
 /*
  * Status: 2010/05/07
@@ -1163,8 +1164,6 @@ static const MemoryRegionOps sm501_2d_engine_ops = {
 
 /* draw line functions for all console modes */
 
-#include "pixel_ops.h"
-
 typedef void draw_line_func(uint8_t *d, const uint8_t *s,
                            int width, const uint32_t *pal);
 

diff --git a/hw/spitz.c b/hw/spitz.c
index 12e2815221df387c7441784322d92fc5621ff613..d4575d20bf13b123e9b546f160611ffb749b19b0 100644 (file)
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -21,7 +21,7 @@
 #include "qemu-timer.h"
 #include "devices.h"
 #include "sharpsl.h"
-#include "console.h"
+#include "ui/console.h"
 #include "block.h"
 #include "audio/audio.h"
 #include "boards.h"

diff --git a/hw/ssd0303.c b/hw/ssd0303.c
index d7fd828c65ca8cdb81de01697be356ee9ccfb0b1..cbdf49af57f9fd18b4884c8fb9778dda05fb096e 100644 (file)
--- a/hw/ssd0303.c
+++ b/hw/ssd0303.c
@@ -11,7 +11,7 @@
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
 #include "i2c.h"
-#include "console.h"
+#include "ui/console.h"
 
 //#define DEBUG_SSD0303 1
 

diff --git a/hw/ssd0323.c b/hw/ssd0323.c
index 4098830c2b8f256ff3dafd879c40605a514df06f..fe6f801ae7cdfb7795453dc19afb825d317606a9 100644 (file)
--- a/hw/ssd0323.c
+++ b/hw/ssd0323.c
@@ -11,7 +11,7 @@
    implement one.  Most of the commends relating to brightness and geometry
    setup are ignored. */
 #include "ssi.h"
-#include "console.h"
+#include "ui/console.h"
 
 //#define DEBUG_SSD0323 1
 

diff --git a/hw/stellaris_input.c b/hw/stellaris_input.c
index 68c600c04c5d76230c46d0a532eac225eecfad03..7a95c3fc8854fe98d8dde87dd20fe59bea686831 100644 (file)
--- a/hw/stellaris_input.c
+++ b/hw/stellaris_input.c
@@ -8,7 +8,7 @@
  */
 #include "hw.h"
 #include "devices.h"
-#include "console.h"
+#include "ui/console.h"
 
 typedef struct {
     qemu_irq irq;

diff --git a/hw/tc6393xb.c b/hw/tc6393xb.c
index f0320271d41367ebaf371b16eca933a64a061fe3..edf76817b5915d2978ff7078e97baaf7a6360b2a 100644 (file)
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -13,8 +13,8 @@
 #include "hw.h"
 #include "devices.h"
 #include "flash.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/pixel_ops.h"
 #include "blockdev.h"
 
 #define IRQ_TC6393_NAND                0

diff --git a/hw/tcx.c b/hw/tcx.c
index a66fbeefdb13bbcebdf8166897bf87a5e1dd72ea..185588b49ca2ad50f9fccb791667cfb7616b9286 100644 (file)
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -23,8 +23,8 @@
  */
 
 #include "qemu-common.h"
-#include "console.h"
-#include "pixel_ops.h"
+#include "ui/console.h"
+#include "ui/pixel_ops.h"
 #include "sysbus.h"
 #include "qdev-addr.h"
 

diff --git a/hw/tsc2005.c b/hw/tsc2005.c
index 9a500ebb3d284824a84cf47108ad119ea755eab4..e2326283c0753b7add1f0827d2e8508d04c158a6 100644 (file)
--- a/hw/tsc2005.c
+++ b/hw/tsc2005.c
@@ -20,7 +20,7 @@
 
 #include "hw.h"
 #include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
 #include "devices.h"
 
 #define TSC_CUT_RESOLUTION(value, p)   ((value) >> (16 - (p ? 12 : 10)))

diff --git a/hw/tsc210x.c b/hw/tsc210x.c
index 3c448a6f0f5a30fabdc798d67234d4bcb3f06f6c..2b3535d4fc04c1a34a94d458e1a02ca523ccbd85 100644 (file)
--- a/hw/tsc210x.c
+++ b/hw/tsc210x.c
@@ -22,7 +22,7 @@
 #include "hw.h"
 #include "audio/audio.h"
 #include "qemu-timer.h"
-#include "console.h"
+#include "ui/console.h"
 #include "omap.h"      /* For I2SCodec and uWireSlave */
 #include "devices.h"
 

diff --git a/hw/twl92230.c b/hw/twl92230.c
index 0d70d8498ddfa531970684bda05b883d938e8370..ce699bdbddc206845085bada2e2c51e9b543cd1a 100644 (file)
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -23,7 +23,7 @@
 #include "qemu-timer.h"
 #include "i2c.h"
 #include "sysemu.h"
-#include "console.h"
+#include "ui/console.h"
 
 #define VERBOSE 1
 

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 87491284a81d7abf623aac01f16ee77997ef0636..6953f2e7104493d27ab2f652a6975ab71d67cf86 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "hw/hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
 #include "qemu-timer.h"

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 50af97109ba9ad36e949fc3eccf3ffecc09cfdc4..de56fea61066cbe3fd72be4238c229d5cdec1ee3 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -13,7 +13,7 @@
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
 #include "hw/scsi.h"
-#include "console.h"
+#include "ui/console.h"
 #include "monitor.h"
 #include "sysemu.h"
 #include "blockdev.h"

diff --git a/hw/usb/dev-wacom.c b/hw/usb/dev-wacom.c
index f7342b08c30abb211a20b7a1d1f089ac4f26e92a..9ab368a6c5b250c37dbef7e39524ded874696221 100644 (file)
--- a/hw/usb/dev-wacom.c
+++ b/hw/usb/dev-wacom.c
@@ -26,7 +26,7 @@
  * THE SOFTWARE.
  */
 #include "hw/hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
 

diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c
index b4e10c12ca60446aec0ecc8362ab48ebaefea60e..e8da3221f6fe0a98e2d26a8e075424db78a00f17 100644 (file)
--- a/hw/usb/host-stub.c
+++ b/hw/usb/host-stub.c
@@ -31,7 +31,7 @@
  */
 
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 #include "hw/usb.h"
 #include "monitor.h"
 

diff --git a/hw/vga-isa-mm.c b/hw/vga-isa-mm.c
index 8ef4320d0574d18e845138ece90720055da3bd4d..008703ff57151f9c0f17db74caf60009753101ef 100644 (file)
--- a/hw/vga-isa-mm.c
+++ b/hw/vga-isa-mm.c
@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "pc.h"
 #include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
 #include "qemu-timer.h"
 
 #define VGA_RAM_SIZE (8192 * 1024)

diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index 046602b3d267b83133b17380519a44420340f807..d1d5b118283c4d69ac36ff9faf7b7dd1a53739ba 100644 (file)
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "pc.h"
 #include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
 #include "qemu-timer.h"
 #include "loader.h"
 

diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 0cb318eab6a8e0845c9765b8a0c55d066154c507..fe3a3d489952f7a9bb0ca8b73aa8d38a51a7bc1e 100644 (file)
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "pci/pci.h"
 #include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
 #include "qemu-timer.h"
 #include "loader.h"
 

diff --git a/hw/vga.c b/hw/vga.c
index ab40d731006c34a5807bb1db9a486f2c2acbefa2..4007116859db68810bfaa28423f7552727159f8f 100644 (file)
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -23,11 +23,11 @@
  */
 #include "hw.h"
 #include "vga.h"
-#include "console.h"
+#include "ui/console.h"
 #include "pc.h"
 #include "pci/pci.h"
 #include "vga_int.h"
-#include "pixel_ops.h"
+#include "ui/pixel_ops.h"
 #include "qemu-timer.h"
 #include "xen.h"
 #include "trace.h"

diff --git a/hw/vmmouse.c b/hw/vmmouse.c
index 6338efa1c396d1b33c41333f0dba466a0b57ce61..d052f33f56274f7f8c97d70654046b982d44b532 100644 (file)
--- a/hw/vmmouse.c
+++ b/hw/vmmouse.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "ps2.h"
 #include "pc.h"
 #include "qdev.h"

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 333ec8cebed09100c36b03efc4ce53abe151f297..b0e772f8634b647dd477ce38fbeebca475e47f76 100644 (file)
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -23,7 +23,7 @@
  */
 #include "hw.h"
 #include "loader.h"
-#include "console.h"
+#include "ui/console.h"
 #include "pci/pci.h"
 
 #undef VERBOSE

diff --git a/hw/xenfb.c b/hw/xenfb.c
index 442a63a320cdf9d251881652c239cabd8cff17fd..b1122bd933f429218115eb17898f2823aaca2e15 100644 (file)
--- a/hw/xenfb.c
+++ b/hw/xenfb.c
@@ -36,7 +36,7 @@
 #include <time.h>
 
 #include "hw.h"
-#include "console.h"
+#include "ui/console.h"
 #include "qemu-char.h"
 #include "xen_backend.h"
 

diff --git a/hw/z2.c b/hw/z2.c
index f62b8067bf7ccfaf6041acd1ad819484f009c2b6..d46186430f5d1b7c5535f3b598132790ba910f26 100644 (file)
--- a/hw/z2.c
+++ b/hw/z2.c
@@ -21,7 +21,7 @@
 #include "sysemu.h"
 #include "flash.h"
 #include "blockdev.h"
-#include "console.h"
+#include "ui/console.h"
 #include "audio/audio.h"
 #include "exec-memory.h"
 

diff --git a/console.h b/include/ui/console.h
similarity index 99%
rename from console.h
rename to include/ui/console.h
index 33354e437a6c02761636a929bfbb2d160f0f6423..777881d4a3fb899e7ef99dc8ff96af42585585f4 100644 (file)
--- a/console.h
+++ b/include/ui/console.h
@@ -1,7 +1,7 @@
 #ifndef CONSOLE_H
 #define CONSOLE_H
 
-#include "qemu-pixman.h"
+#include "ui/qemu-pixman.h"
 #include "qdict.h"
 #include "notify.h"
 #include "monitor.h"

diff --git a/hw/pixel_ops.h b/include/ui/pixel_ops.h
similarity index 100%
rename from hw/pixel_ops.h
rename to include/ui/pixel_ops.h

diff --git a/qemu-pixman.h b/include/ui/qemu-pixman.h
similarity index 100%
rename from qemu-pixman.h
rename to include/ui/qemu-pixman.h

diff --git a/ui/qemu-spice.h b/include/ui/qemu-spice.h
similarity index 100%
rename from ui/qemu-spice.h
rename to include/ui/qemu-spice.h

diff --git a/ui/spice-display.h b/include/ui/spice-display.h
similarity index 99%
rename from ui/spice-display.h
rename to include/ui/spice-display.h
index 38b6ea98b3207386938d155e25caada86a4b9992..928e0a1baecba1b15616d2c1cd4c35f10aee603f 100644 (file)
--- a/ui/spice-display.h
+++ b/include/ui/spice-display.h
@@ -20,7 +20,7 @@
 #include <spice/qxl_dev.h>
 
 #include "qemu-thread.h"
-#include "qemu-pixman.h"
+#include "ui/qemu-pixman.h"
 #include "sysemu.h"
 
 #define NUM_MEMSLOTS 8

diff --git a/monitor.c b/monitor.c
index 37b9d20299edc8d4f4552e8b87b489531e8167fb..6546f8c30b92e66d2f287cb5cc03894b18673781 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -38,7 +38,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/disas.h"

diff --git a/qemu-char.c b/qemu-char.c
index f066ad0654df4f22c50da4397f85bdb672d57dc2..bc53d09a9bab90b70588b5299d46c707b5402ad0 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -23,7 +23,7 @@
  */
 #include "qemu-common.h"
 #include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 #include "qemu-timer.h"
 #include "qemu-char.h"

diff --git a/qemu-timer.c b/qemu-timer.c
index 9b9585b259681a8e5ea1b406e7947e7f38b6a041..5a99403fda906f01f4f9dbaafa9a34fb2862cc48 100644 (file)
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -24,7 +24,7 @@
 
 #include "sysemu.h"
 #include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
 
 #include "hw/hw.h"
 

diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index a9e226bde4fd50e0331756de602bad542a07bea6..4b6856137d5136bea51f03470fca6c0208b3298d 100644 (file)
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -13,7 +13,7 @@
 #include "gdbstub.h"
 #include "helper.h"
 #include "host-utils.h"
-#include "console.h"
+#include "ui/console.h"
 
 #undef DEBUG_UC32
 

diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index fd339d247be98fbe73e192ef0bafd1271a1e3be2..dc8f0e46ad09fa1c74998dcdbb922544e6c3701c 100644 (file)
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -6,7 +6,7 @@ vnc-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
 vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
 vnc-obj-y += vnc-jobs.o
 
-common-obj-y += keymaps.o
+common-obj-y += keymaps.o console.o cursor.o input.o qemu-pixman.o
 common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
 common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
 common-obj-$(CONFIG_COCOA) += cocoa.o

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 87d2e44c6901098b076d62af805ec3bd55915123..0afa6f86dd685026bc2346b779e3f09eacda1a26 100644 (file)
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -26,7 +26,7 @@
 #include <crt_externs.h>
 
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 
 #ifndef MAC_OS_X_VERSION_10_4

diff --git a/console.c b/ui/console.c
similarity index 99%
rename from console.c
rename to ui/console.c
index 9ac7b287428c541ab71218c2c1c3c2e92966fd8c..60bfb72ac2a9c48fa06c58d2ac0c6696e7342e84 100644 (file)
--- a/console.c
+++ b/ui/console.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 #include "qemu-timer.h"
 #include "qmp-commands.h"
 #include "qemu-char.h"

diff --git a/ui/curses.c b/ui/curses.c
index 5dc0b2c95f1345a4c0c89d74913736b9988431a7..5d15e9e16ee44fecf9ed559a1f40c4b35f8d393b 100644 (file)
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -29,7 +29,7 @@
 #endif
 
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 
 #define FONT_HEIGHT 16

diff --git a/cursor.c b/ui/cursor.c
similarity index 99%
rename from cursor.c
rename to ui/cursor.c
index 76e262caf7b986e5aedb6e26a4886e2aca3d0797..2b8dd3fa50ab4f9c1d65a89d3823426d9fa6245c 100644 (file)
--- a/cursor.c
+++ b/ui/cursor.c
@@ -1,5 +1,5 @@
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 
 #include "cursor_hidden.xpm"
 #include "cursor_left_ptr.xpm"

diff --git a/cursor_hidden.xpm b/ui/cursor_hidden.xpm
similarity index 100%
rename from cursor_hidden.xpm
rename to ui/cursor_hidden.xpm

diff --git a/cursor_left_ptr.xpm b/ui/cursor_left_ptr.xpm
similarity index 100%
rename from cursor_left_ptr.xpm
rename to ui/cursor_left_ptr.xpm

diff --git a/input.c b/ui/input.c
similarity index 99%
rename from input.c
rename to ui/input.c
index 123bb237d48fa0b6650e88c268cc2b24ccfc8005..58d3b4709cb263cee6fbdf4a5daa955ad3a67032 100644 (file)
--- a/input.c
+++ b/ui/input.c
@@ -24,7 +24,7 @@
 
 #include "sysemu.h"
 #include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
 #include "error.h"
 #include "qmp-commands.h"
 #include "qapi-types.h"

diff --git a/qemu-pixman.c b/ui/qemu-pixman.c
similarity index 98%
rename from qemu-pixman.c
rename to ui/qemu-pixman.c
index e7263fb2bf5face3dfed19a924674512deeba1cc..609335ab1153fb9cd6cc9ae95ca6491a47b95035 100644 (file)
--- a/qemu-pixman.c
+++ b/ui/qemu-pixman.c
@@ -3,7 +3,7 @@
  * See the COPYING file in the top-level directory.
  */
 
-#include "qemu-pixman.h"
+#include "ui/qemu-pixman.h"
 
 int qemu_pixman_get_type(int rshift, int gshift, int bshift)
 {

diff --git a/qemu-x509.h b/ui/qemu-x509.h
similarity index 100%
rename from qemu-x509.h
rename to ui/qemu-x509.h

diff --git a/ui/sdl.c b/ui/sdl.c
index 37f01b217d890ce386721ffd1bb48c1aba26c653..bcbf89daeb698f69bff33e2394f59a5b020f3fac 100644 (file)
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -29,7 +29,7 @@
 #include <SDL_syswm.h>
 
 #include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 #include "x_keymap.h"
 #include "sdl_zoom.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 261c6f2c11c996d50ebd3dda3a05682618b0a45d..ec925ecbb02369688619b616de5323e2227c96ab 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -22,7 +22,7 @@
 #include "sysemu.h"
 
 #include "qemu-common.h"
-#include "qemu-spice.h"
+#include "ui/qemu-spice.h"
 #include "qemu-thread.h"
 #include "qemu-timer.h"
 #include "qemu-queue.h"
@@ -37,7 +37,7 @@
 #include "migration.h"
 #include "monitor.h"
 #include "hw/hw.h"
-#include "spice-display.h"
+#include "ui/spice-display.h"
 
 /* core bits */
 

diff --git a/ui/spice-display.c b/ui/spice-display.c
index 6aff3368cacd805dffb194a332a8fa69b66174a9..681fe32fedee7896309227e3c8504103429f5be6 100644 (file)
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -16,15 +16,15 @@
  */
 
 #include "qemu-common.h"
-#include "qemu-spice.h"
+#include "ui/qemu-spice.h"
 #include "qemu-timer.h"
 #include "qemu-queue.h"
 #include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 #include "trace.h"
 
-#include "spice-display.h"
+#include "ui/spice-display.h"
 
 static int debug = 0;
 

diff --git a/ui/spice-input.c b/ui/spice-input.c
index af4223d44261eb82fe2830441b2865d355f6f40c..3beb8deadb50967502a747faa7a95ef86a1a74be 100644 (file)
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -24,8 +24,8 @@
 #include <spice/enums.h>
 
 #include "qemu-common.h"
-#include "qemu-spice.h"
-#include "console.h"
+#include "ui/qemu-spice.h"
+#include "ui/console.h"
 
 /* keyboard bits */
 

diff --git a/vgafont.h b/ui/vgafont.h
similarity index 100%
rename from vgafont.h
rename to ui/vgafont.h

diff --git a/ui/vnc.h b/ui/vnc.h
index 6141e88b4e969eeee2ceed3742a5554a43f20078..7ec183372a98e403d4433a727c135af0ddc4d1aa 100644 (file)
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -30,7 +30,7 @@
 #include "qemu-common.h"
 #include "qemu-queue.h"
 #include "qemu-thread.h"
-#include "console.h"
+#include "ui/console.h"
 #include "monitor.h"
 #include "audio/audio.h"
 #include "bitmap.h"

diff --git a/vl.c b/vl.c
index a7eeafc26ecb54b29e70502a21da0c340595a79e..6713220905b27a7269bd464d1df0f844cbc38020 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -130,7 +130,7 @@ int main(int argc, char **argv)
 #include "net/net.h"
 #include "net/slirp.h"
 #include "monitor.h"
-#include "console.h"
+#include "ui/console.h"
 #include "sysemu.h"
 #include "gdbstub.h"
 #include "qemu-timer.h"