[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/32] ui: move files to ui/ and include/ui/
|
From: |
Paolo Bonzini |
|
Subject: |
[Qemu-devel] [PATCH 17/32] ui: move files to ui/ and include/ui/ |
|
Date: |
Wed, 24 Oct 2012 14:58:47 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 4 +---
hmp.c | 2 +-
hw/adb.c | 2 +-
hw/ads7846.c | 2 +-
hw/applesmc.c | 2 +-
hw/blizzard.c | 2 +-
hw/bt-hid.c | 2 +-
hw/cirrus_vga.c | 2 +-
hw/escc.c | 2 +-
hw/exynos4210_fimd.c | 2 +-
hw/framebuffer.c | 2 +-
hw/g364fb.c | 2 +-
hw/hid.c | 2 +-
hw/hpet.c | 2 +-
hw/jazz_led.c | 2 +-
hw/kvm/pci-assign.c | 2 +-
hw/lm832x.c | 2 +-
hw/milkymist-softusb.c | 2 +-
hw/milkymist-vgafb.c | 2 +-
hw/msmouse.c | 6 +++---
hw/musicpal.c | 2 +-
hw/nseries.c | 2 +-
hw/omap_dss.c | 2 +-
hw/omap_lcdc.c | 2 +-
hw/omap_sx1.c | 2 +-
hw/palm.c | 2 +-
hw/pl110.c | 2 +-
hw/ps2.c | 2 +-
hw/puv3.c | 2 +-
hw/pxa2xx_keypad.c | 2 +-
hw/pxa2xx_lcd.c | 2 +-
hw/qxl.h | 2 +-
hw/sm501.c | 2 +-
hw/spitz.c | 2 +-
hw/ssd0303.c | 2 +-
hw/ssd0323.c | 2 +-
hw/stellaris_input.c | 2 +-
hw/tc6393xb.c | 2 +-
hw/tcx.c | 2 +-
hw/tsc2005.c | 2 +-
hw/tsc210x.c | 2 +-
hw/twl92230.c | 2 +-
hw/usb/dev-hid.c | 2 +-
hw/usb/dev-storage.c | 2 +-
hw/usb/dev-wacom.c | 2 +-
hw/usb/host-stub.c | 2 +-
hw/vga-isa-mm.c | 2 +-
hw/vga-isa.c | 2 +-
hw/vga-pci.c | 2 +-
hw/vga.c | 2 +-
hw/vmmouse.c | 2 +-
hw/vmware_vga.c | 2 +-
hw/xenfb.c | 2 +-
hw/z2.c | 2 +-
console.h => include/ui/console.h | 0
pflib.h => include/ui/pflib.h | 0
{ui => include/ui}/qemu-spice.h | 0
{ui => include/ui}/spice-display.h | 2 +-
monitor.c | 2 +-
qemu-char.c | 2 +-
qemu-timer.c | 2 +-
target-unicore32/helper.c | 2 +-
ui/Makefile.objs | 2 +-
ui/cocoa.m | 2 +-
console.c => ui/console.c | 2 +-
ui/curses.c | 2 +-
cursor.c => ui/cursor.c | 2 +-
cursor_hidden.xpm => ui/cursor_hidden.xpm | 0
cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm | 0
input.c => ui/input.c | 2 +-
pflib.c => ui/pflib.c | 4 ++--
qemu-x509.h => ui/qemu-x509.h | 0
ui/sdl.c | 2 +-
ui/spice-core.c | 4 ++--
ui/spice-display.c | 6 +++---
ui/spice-input.c | 4 ++--
vgafont.h => ui/vgafont.h | 0
ui/vnc.h | 2 +-
vl.c | 2 +-
79 files changed, 79 insertions(+), 81 deletions(-)
rename console.h => include/ui/console.h (100%)
rename pflib.h => include/ui/pflib.h (100%)
rename {ui => include/ui}/qemu-spice.h (100%)
rename {ui => include/ui}/spice-display.h (99%)
rename console.c => ui/console.c (99%)
rename cursor.c => ui/cursor.c (99%)
rename cursor_hidden.xpm => ui/cursor_hidden.xpm (100%)
rename cursor_left_ptr.xpm => ui/cursor_left_ptr.xpm (100%)
rename input.c => ui/input.c (99%)
rename pflib.c => ui/pflib.c (99%)
rename qemu-x509.h => ui/qemu-x509.h (100%)
rename vgafont.h => ui/vgafont.h (100%)
diff --git a/Makefile.objs b/Makefile.objs
index 545b822..bd9534d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -64,7 +64,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 += readline.o
common-obj-y += $(oslib-obj-y)
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
@@ -73,11 +73,9 @@ 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
-common-obj-y += pflib.o
common-obj-y += bitmap.o bitops.o
common-obj-y += page_cache.o
diff --git a/hmp.c b/hmp.c
index 313233f..ea410ef 100644
--- a/hmp.c
+++ b/hmp.c
@@ -20,7 +20,7 @@
#include "qemu-timer.h"
#include "qmp-commands.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 aa15f55..e6b8022 100644
--- 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 2ea9e55..fa137e6 100644
--- 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 8bedaad..91e7cb3 100644
--- 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 06e19b3..b725d9b 100644
--- a/hw/blizzard.c
+++ b/hw/blizzard.c
@@ -19,7 +19,7 @@
*/
#include "qemu-common.h"
-#include "console.h"
+#include "ui/console.h"
#include "devices.h"
#include "vga_int.h"
#include "pixel_ops.h"
diff --git a/hw/bt-hid.c b/hw/bt-hid.c
index 8d7a3da..0ec0c01 100644
--- 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 a101329..2559389 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -28,7 +28,7 @@
*/
#include "hw.h"
#include "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 e1f5e73..ce5a082 100644
--- 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 3313f00..35ed48c 100644
--- a/hw/exynos4210_fimd.c
+++ b/hw/exynos4210_fimd.c
@@ -25,7 +25,7 @@
#include "qemu-common.h"
#include "cpu-all.h"
#include "sysbus.h"
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "bswap.h"
diff --git a/hw/framebuffer.c b/hw/framebuffer.c
index 27fa6f5..3d529ff 100644
--- 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 059e622..6790600 100644
--- a/hw/g364fb.c
+++ b/hw/g364fb.c
@@ -18,7 +18,7 @@
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "trace.h"
#include "sysbus.h"
diff --git a/hw/hid.c b/hw/hid.c
index 03761ab..7935998 100644
--- 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 fd3ddca..6b5b198 100644
--- 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 6486523..24754be 100644
--- a/hw/jazz_led.c
+++ b/hw/jazz_led.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "trace.h"
#include "sysbus.h"
diff --git a/hw/kvm/pci-assign.c b/hw/kvm/pci-assign.c
index 7a0998c..1bfddb0 100644
--- 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 8e09f9b..b14a089 100644
--- 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 ecc2be9..62585c4 100644
--- 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 cd4365d..6a07bc6 100644
--- a/hw/milkymist-vgafb.c
+++ b/hw/milkymist-vgafb.c
@@ -25,7 +25,7 @@
#include "hw.h"
#include "sysbus.h"
#include "trace.h"
-#include "console.h"
+#include "ui/console.h"
#include "framebuffer.h"
#include "pixel_ops.h"
#include "qemu-error.h"
diff --git a/hw/msmouse.c b/hw/msmouse.c
index 9c492a4..decb1a3 100644
--- 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 4551c25..8389db6 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -20,7 +20,7 @@
#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"
diff --git a/hw/nseries.c b/hw/nseries.c
index 7ada90d..371f52e 100644
--- 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 86ed6ea..d9036d5 100644
--- 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 e2ba108..675625c 100644
--- a/hw/omap_lcdc.c
+++ b/hw/omap_lcdc.c
@@ -17,7 +17,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 "framebuffer.h"
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index ad17487..30e02bb 100644
--- 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 032b8d6..37dde1e 100644
--- 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 a582640..39f1333 100644
--- a/hw/pl110.c
+++ b/hw/pl110.c
@@ -8,7 +8,7 @@
*/
#include "sysbus.h"
-#include "console.h"
+#include "ui/console.h"
#include "framebuffer.h"
#define PL110_CR_EN 0x001
diff --git a/hw/ps2.c b/hw/ps2.c
index f93cd24..ba80089 100644
--- 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 764799c..887a37a 100644
--- a/hw/puv3.c
+++ b/hw/puv3.c
@@ -8,7 +8,7 @@
* published by the Free Software Foundation, or any later version.
* See the COPYING file in the top-level directory.
*/
-#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 1a997c9..85ad251 100644
--- 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 ee8bf57..0b1ee9a 100644
--- a/hw/pxa2xx_lcd.c
+++ b/hw/pxa2xx_lcd.c
@@ -11,7 +11,7 @@
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pxa.h"
#include "pixel_ops.h"
/* FIXME: For graphic_rotate. Should probably be done in common code. */
diff --git a/hw/qxl.h b/hw/qxl.h
index e583cfb..8202c08 100644
--- 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.h"
#include "vga_int.h"
diff --git a/hw/sm501.c b/hw/sm501.c
index 050d096..c677f20 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -25,7 +25,7 @@
#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"
diff --git a/hw/spitz.c b/hw/spitz.c
index 2942626..5048b66 100644
--- 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 4e1ee6e..0160ff9 100644
--- 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 9c42d64..c1f8c89 100644
--- 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 68c600c..7a95c3f 100644
--- 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 420925c..afb78bb 100644
--- a/hw/tc6393xb.c
+++ b/hw/tc6393xb.c
@@ -13,7 +13,7 @@
#include "hw.h"
#include "devices.h"
#include "flash.h"
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "blockdev.h"
diff --git a/hw/tcx.c b/hw/tcx.c
index 2db2db1..72de9c2 100644
--- a/hw/tcx.c
+++ b/hw/tcx.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
-#include "console.h"
+#include "ui/console.h"
#include "pixel_ops.h"
#include "sysbus.h"
#include "qdev-addr.h"
diff --git a/hw/tsc2005.c b/hw/tsc2005.c
index 9a500eb..e232628 100644
--- 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 3c448a6..2b3535d 100644
--- 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 0d70d84..ce699bd 100644
--- 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 b3dcd23..58b7995 100644
--- 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 e732191..02fb051 100644
--- 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 ed9a5ee..0910e34 100644
--- 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 b4e10c1..e8da322 100644
--- 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 306e6ba..486d375 100644
--- a/hw/vga-isa-mm.c
+++ b/hw/vga-isa-mm.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "vga_int.h"
#include "pixel_ops.h"
diff --git a/hw/vga-isa.c b/hw/vga-isa.c
index 046602b..c7cbded 100644
--- a/hw/vga-isa.c
+++ b/hw/vga-isa.c
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "vga_int.h"
#include "pixel_ops.h"
diff --git a/hw/vga-pci.c b/hw/vga-pci.c
index 5c4daee..4609924 100644
--- a/hw/vga-pci.c
+++ b/hw/vga-pci.c
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include "hw.h"
-#include "console.h"
+#include "ui/console.h"
#include "pci.h"
#include "vga_int.h"
#include "pixel_ops.h"
diff --git a/hw/vga.c b/hw/vga.c
index a07a6fb..ca07013 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -23,7 +23,7 @@
*/
#include "hw.h"
#include "vga.h"
-#include "console.h"
+#include "ui/console.h"
#include "pc.h"
#include "pci.h"
#include "vga_int.h"
diff --git a/hw/vmmouse.c b/hw/vmmouse.c
index 6338efa..d052f33 100644
--- 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 6f7074e..83dbc8b 100644
--- 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.h"
#undef VERBOSE
diff --git a/hw/xenfb.c b/hw/xenfb.c
index 338800a..5fbbc9e 100644
--- 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 f62b806..d461864 100644
--- 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 100%
rename from console.h
rename to include/ui/console.h
diff --git a/pflib.h b/include/ui/pflib.h
similarity index 100%
rename from pflib.h
rename to include/ui/pflib.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 d766927..3e58380 100644
--- 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 "console.h"
+#include "ui/console.h"
#include "pflib.h"
#include "sysemu.h"
diff --git a/monitor.c b/monitor.c
index cd8870b..874c3ee 100644
--- 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 255a3ae..ffaab2c 100644
--- 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 204f13e..5948e54 100644
--- 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 a9e226b..4b68561 100644
--- 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 fd339d2..fa815c1 100644
--- 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 pflib.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 2383646..611bb26 100644
--- 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 eb46d79..0d80e4e 100644
--- 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 c2be2c6..d5dcb8d 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -33,7 +33,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 76e262c..2b8dd3f 100644
--- 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 123bb23..58d3b47 100644
--- 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/pflib.c b/ui/pflib.c
similarity index 99%
rename from pflib.c
rename to ui/pflib.c
index 987e110..6eefa58 100644
--- a/pflib.c
+++ b/ui/pflib.c
@@ -10,8 +10,8 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "qemu-common.h"
-#include "console.h"
-#include "pflib.h"
+#include "ui/console.h"
+#include "ui/pflib.h"
typedef struct QemuPixel QemuPixel;
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 f6f711c..485cb08 100644
--- 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 5147365..27e9ba1 100644
--- 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 b61764f..1355cba 100644
--- 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 af4223d..3beb8de 100644
--- 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 068c2fc..f86db6e 100644
--- 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 88880f6..ab21a93 100644
--- 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"
--
1.7.1
- [Qemu-devel] [PATCH 18/32] audio: move public header file to include/audio/, (continued)
- [Qemu-devel] [PATCH 18/32] audio: move public header file to include/audio/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 31/32] hw: move executable format header files to hw/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 30/32] fpu: move public header file to include/fpu, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 09/32] janitor: move iovector functions out of cutils.c, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 19/32] slirp: move public header file to include/slirp/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 32/32] janitor: move remaining public headers to include/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 26/32] qom: move include files to include/qom/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 08/32] build: kill libuser, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 25/32] migration: move include files to include/migration/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 16/32] qemu-ga: move qemu-ga files to qga/, Paolo Bonzini, 2012/10/24
- [Qemu-devel] [PATCH 17/32] ui: move files to ui/ and include/ui/,
Paolo Bonzini <=
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Andreas Färber, 2012/10/24
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Stefan Hajnoczi, 2012/10/25
- Re: [Qemu-devel] [PATCH 00/32] Header file renaming and cleanup, Zhi Yong Wu, 2012/10/25