diff mbox

[4/4] Remove sysemu.h

Message ID AANLkTi=9FfO7gD=bjhq3Z5imvOg2CwnUyHZ0ETGJtzkN@mail.gmail.com
State New
Headers show

Commit Message

Blue Swirl March 26, 2011, 10:29 p.m. UTC 
Move the remainders of sysemu.h to cpus.h, qemu-common.h
and qemu-timer.h. Adjust users.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 acl.c                         |    1 -
 arch_init.c                   |    2 +-
 arm-semi.c                    |    1 -
 audio/winwaveaudio.c          |    1 -
 balloon.c                     |    1 -
 block/vdi.c                   |    1 -
 bt-host.c                     |    1 -
 bt-vhci.c                     |    1 -
 buffered_file.c               |    1 -
 cpus.c                        |    1 -
 cpus.h                        |    4 ++++
 device_tree.c                 |    1 -
 hw/an5206.c                   |    1 -
 hw/armv7m.c                   |    1 -
 hw/axis_dev88.c               |    1 -
 hw/blizzard.c                 |    1 -
 hw/bt-hci-csr.c               |    1 -
 hw/cris-boot.c                |    1 -
 hw/dummy_m68k.c               |    1 -
 hw/etraxfs.c                  |    1 -
 hw/gumstix.c                  |    1 -
 hw/ide/ich.c                  |    1 -
 hw/ide/isa.c                  |    1 -
 hw/ide/macio.c                |    1 -
 hw/ide/microdrive.c           |    1 -
 hw/ide/mmio.c                 |    1 -
 hw/ide/pci.c                  |    1 -
 hw/integratorcp.c             |    1 -
 hw/isa-bus.c                  |    1 -
 hw/kvmclock.c                 |    1 -
 hw/lan9118.c                  |    2 +-
 hw/lm32_boards.c              |    1 -
 hw/mainstone.c                |    1 -
 hw/omap_sx1.c                 |    1 -
 hw/pc.c                       |    1 -
 hw/pci-stub.c                 |    1 -
 hw/pcie.c                     |    2 +-
 hw/petalogix_s3adsp1800_mmu.c |    1 -
 hw/ppc440_bamboo.c            |    1 -
 hw/ppc4xx_devs.c              |    1 -
 hw/qxl.c                      |    1 -
 hw/s390-virtio-bus.c          |    1 -
 hw/s390-virtio.c              |    1 -
 hw/stellaris.c                |    1 -
 hw/syborg.c                   |    1 -
 hw/syborg_virtio.c            |    1 -
 hw/sysbus.c                   |    1 -
 hw/tc58128.c                  |    1 -
 hw/tosa.c                     |    1 -
 hw/twl92230.c                 |    1 -
 hw/usb-hid.c                  |    2 +-
 hw/virtio-balloon.c           |    1 -
 hw/virtio.c                   |    1 -
 hw/virtio.h                   |    1 -
 hw/vmport.c                   |    1 -
 hw/watchdog.c                 |    1 -
 hw/xen_backend.h              |    1 -
 hw/xilinx_timer.c             |    1 -
 kvm-stub.c                    |    1 -
 m68k-semi.c                   |    1 -
 migration-exec.c              |    1 -
 migration-fd.c                |    1 -
 migration-tcp.c               |    1 -
 migration-unix.c              |    1 -
 monitor.c                     |    1 -
 net.c                         |    1 -
 net/dump.c                    |    2 +-
 net/slirp.c                   |    1 -
 net/tap-bsd.c                 |    1 -
 net/tap-linux.c               |    1 -
 net/tap-solaris.c             |    1 -
 net/tap-win32.c               |    1 -
 net/tap.c                     |    1 -
 net/vde.c                     |    1 -
 os-posix.c                    |    1 -
 os-win32.c                    |    1 -
 osdep.c                       |    1 -
 oslib-posix.c                 |    1 -
 posix-aio-compat.c            |    1 -
 qemu-common.h                 |   14 ++++++++++++++
 qemu-config.c                 |    1 -
 qemu-error.c                  |    1 -
 qemu-img.c                    |    1 -
 qemu-timer.c                  |    1 -
 qemu-timer.h                  |    4 ++++
 qemu-tool.c                   |    1 -
 savevm.c                      |    2 +-
 sysemu.h                      |   35 -----------------------------------
 target-ppc/kvm.c              |    1 -
 target-s390x/kvm.c            |    1 -
 ui/cocoa.m                    |    1 -
 ui/keymaps.c                  |    1 -
 ui/sdl.c                      |    1 -
 ui/spice-display.c            |    1 -
 vl.c                          |    1 -
 95 files changed, 28 insertions(+), 126 deletions(-)
 delete mode 100644 sysemu.h
diff mbox

Patch

From 184f33f40a0eb41e37049a87b7c34f13c8247296 Mon Sep 17 00:00:00 2001
Message-Id: <184f33f40a0eb41e37049a87b7c34f13c8247296.1301178270.git.blauwirbel@gmail.com>
In-Reply-To: <1ae00000c153f56f45a62e9520a773bbfa3d185c.1301178269.git.blauwirbel@gmail.com>
References: <1ae00000c153f56f45a62e9520a773bbfa3d185c.1301178269.git.blauwirbel@gmail.com>
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 26 Mar 2011 21:41:11 +0000
Subject: [PATCH 4/4] Remove sysemu.h

Move the remainders of sysemu.h to qemu-common.h and qemu-timer.h,
adjust users.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 acl.c                         |    1 -
 arch_init.c                   |    2 +-
 arm-semi.c                    |    1 -
 audio/winwaveaudio.c          |    1 -
 balloon.c                     |    1 -
 block/vdi.c                   |    1 -
 bt-host.c                     |    1 -
 bt-vhci.c                     |    1 -
 buffered_file.c               |    1 -
 cpus.c                        |    1 -
 cpus.h                        |    4 ++++
 device_tree.c                 |    1 -
 hw/an5206.c                   |    1 -
 hw/armv7m.c                   |    1 -
 hw/axis_dev88.c               |    1 -
 hw/blizzard.c                 |    1 -
 hw/bt-hci-csr.c               |    1 -
 hw/cris-boot.c                |    1 -
 hw/dummy_m68k.c               |    1 -
 hw/etraxfs.c                  |    1 -
 hw/gumstix.c                  |    1 -
 hw/ide/ich.c                  |    1 -
 hw/ide/isa.c                  |    1 -
 hw/ide/macio.c                |    1 -
 hw/ide/microdrive.c           |    1 -
 hw/ide/mmio.c                 |    1 -
 hw/ide/pci.c                  |    1 -
 hw/integratorcp.c             |    1 -
 hw/isa-bus.c                  |    1 -
 hw/kvmclock.c                 |    1 -
 hw/lan9118.c                  |    2 +-
 hw/lm32_boards.c              |    1 -
 hw/mainstone.c                |    1 -
 hw/omap_sx1.c                 |    1 -
 hw/pc.c                       |    1 -
 hw/pci-stub.c                 |    1 -
 hw/pcie.c                     |    2 +-
 hw/petalogix_s3adsp1800_mmu.c |    1 -
 hw/ppc440_bamboo.c            |    1 -
 hw/ppc4xx_devs.c              |    1 -
 hw/qxl.c                      |    1 -
 hw/s390-virtio-bus.c          |    1 -
 hw/s390-virtio.c              |    1 -
 hw/stellaris.c                |    1 -
 hw/syborg.c                   |    1 -
 hw/syborg_virtio.c            |    1 -
 hw/sysbus.c                   |    1 -
 hw/tc58128.c                  |    1 -
 hw/tosa.c                     |    1 -
 hw/twl92230.c                 |    1 -
 hw/usb-hid.c                  |    2 +-
 hw/virtio-balloon.c           |    1 -
 hw/virtio.c                   |    1 -
 hw/virtio.h                   |    1 -
 hw/vmport.c                   |    1 -
 hw/watchdog.c                 |    1 -
 hw/xen_backend.h              |    1 -
 hw/xilinx_timer.c             |    1 -
 kvm-stub.c                    |    1 -
 m68k-semi.c                   |    1 -
 migration-exec.c              |    1 -
 migration-fd.c                |    1 -
 migration-tcp.c               |    1 -
 migration-unix.c              |    1 -
 monitor.c                     |    1 -
 net.c                         |    1 -
 net/dump.c                    |    2 +-
 net/slirp.c                   |    1 -
 net/tap-bsd.c                 |    1 -
 net/tap-linux.c               |    1 -
 net/tap-solaris.c             |    1 -
 net/tap-win32.c               |    1 -
 net/tap.c                     |    1 -
 net/vde.c                     |    1 -
 os-posix.c                    |    1 -
 os-win32.c                    |    1 -
 osdep.c                       |    1 -
 oslib-posix.c                 |    1 -
 posix-aio-compat.c            |    1 -
 qemu-common.h                 |   14 ++++++++++++++
 qemu-config.c                 |    1 -
 qemu-error.c                  |    1 -
 qemu-img.c                    |    1 -
 qemu-timer.c                  |    1 -
 qemu-timer.h                  |    4 ++++
 qemu-tool.c                   |    1 -
 savevm.c                      |    2 +-
 sysemu.h                      |   35 -----------------------------------
 target-ppc/kvm.c              |    1 -
 target-s390x/kvm.c            |    1 -
 ui/cocoa.m                    |    1 -
 ui/keymaps.c                  |    1 -
 ui/sdl.c                      |    1 -
 ui/spice-display.c            |    1 -
 vl.c                          |    1 -
 95 files changed, 28 insertions(+), 126 deletions(-)
 delete mode 100644 sysemu.h

diff --git a/acl.c b/acl.c
index 311dade..82c2704 100644
--- a/acl.c
+++ b/acl.c
@@ -24,7 +24,6 @@ 
 
 
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "acl.h"
 
 #ifdef CONFIG_FNMATCH
diff --git a/arch_init.c b/arch_init.c
index 2dac75c..5bba957 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -30,7 +30,6 @@ 
 #endif
 #include "config.h"
 #include "monitor.h"
-#include "sysemu.h"
 #include "arch_init.h"
 #include "audio/audio.h"
 #include "hw/pc.h"
@@ -42,6 +41,7 @@ 
 #include "gdbstub.h"
 #include "hw/smbios.h"
 #include "vm-state.h"
+#include "qemu-timer.h"
 
 #ifdef TARGET_SPARC
 int graphic_width = 1024;
diff --git a/arm-semi.c b/arm-semi.c
index 1d5179b..e9e6f89 100644
--- a/arm-semi.c
+++ b/arm-semi.c
@@ -33,7 +33,6 @@ 
 #define ARM_ANGEL_HEAP_SIZE (128 * 1024 * 1024)
 #else
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "gdbstub.h"
 #endif
 
diff --git a/audio/winwaveaudio.c b/audio/winwaveaudio.c
index e5ad3c6..3d06bc5 100644
--- a/audio/winwaveaudio.c
+++ b/audio/winwaveaudio.c
@@ -1,7 +1,6 @@ 
 /* public domain */
 
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "audio.h"
 
 #define AUDIO_CAP "winwave"
diff --git a/balloon.c b/balloon.c
index 0021fef..248c1b5 100644
--- a/balloon.c
+++ b/balloon.c
@@ -22,7 +22,6 @@ 
  * THE SOFTWARE.
  */
 
-#include "sysemu.h"
 #include "monitor.h"
 #include "qjson.h"
 #include "qint.h"
diff --git a/block/vdi.c b/block/vdi.c
index 9054079..4a553d6 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -57,7 +57,6 @@ 
 #include <uuid/uuid.h>
 #else
 /* TODO: move uuid emulation to some central place in QEMU. */
-#include "sysemu.h"     /* UUID_FMT */
 typedef unsigned char uuid_t[16];
 void uuid_generate(uuid_t out);
 int uuid_is_null(const uuid_t uu);
diff --git a/bt-host.c b/bt-host.c
index 6931e7c..095254d 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -19,7 +19,6 @@ 
 
 #include "qemu-common.h"
 #include "qemu-char.h"
-#include "sysemu.h"
 #include "net.h"
 #include "bt-host.h"
 
diff --git a/bt-vhci.c b/bt-vhci.c
index 679c5e0..3c57720 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -19,7 +19,6 @@ 
 
 #include "qemu-common.h"
 #include "qemu-char.h"
-#include "sysemu.h"
 #include "net.h"
 #include "hw/bt.h"
 
diff --git a/buffered_file.c b/buffered_file.c
index b5e2baf..41b42c3 100644
--- a/buffered_file.c
+++ b/buffered_file.c
@@ -14,7 +14,6 @@ 
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "qemu-timer.h"
-#include "sysemu.h"
 #include "qemu-char.h"
 #include "buffered_file.h"
 
diff --git a/cpus.c b/cpus.c
index 997a60d..39fe0ff 100644
--- a/cpus.c
+++ b/cpus.c
@@ -26,7 +26,6 @@ 
 #include "config-host.h"
 
 #include "monitor.h"
-#include "sysemu.h"
 #include "gdbstub.h"
 #include "dma.h"
 #include "kvm.h"
diff --git a/cpus.h b/cpus.h
index e021126..baa8473 100644
--- a/cpus.h
+++ b/cpus.h
@@ -17,4 +17,8 @@  void set_numa_modes(void);
 void set_cpu_log(const char *optarg);
 void list_cpus(FILE *f, fprintf_function cpu_fprintf, const char *optarg);
 
+void cpu_synchronize_all_states(void);
+void cpu_synchronize_all_post_reset(void);
+void cpu_synchronize_all_post_init(void);
+
 #endif
diff --git a/device_tree.c b/device_tree.c
index 426a631..63aa8cf 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -20,7 +20,6 @@ 
 
 #include "config.h"
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "device_tree.h"
 #include "hw/loader.h"
 
diff --git a/hw/an5206.c b/hw/an5206.c
index b9f19a9..42a0163 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -9,7 +9,6 @@ 
 #include "hw.h"
 #include "pc.h"
 #include "mcf.h"
-#include "sysemu.h"
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
diff --git a/hw/armv7m.c b/hw/armv7m.c
index 304cd34..72d010a 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -9,7 +9,6 @@ 
 
 #include "sysbus.h"
 #include "arm-misc.h"
-#include "sysemu.h"
 #include "loader.h"
 #include "elf.h"
 
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index 57b5e2f..0e2135a 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -26,7 +26,6 @@ 
 #include "net.h"
 #include "flash.h"
 #include "boards.h"
-#include "sysemu.h"
 #include "etraxfs.h"
 #include "loader.h"
 #include "elf.h"
diff --git a/hw/blizzard.c b/hw/blizzard.c
index 5f329ad..c524550 100644
--- a/hw/blizzard.c
+++ b/hw/blizzard.c
@@ -19,7 +19,6 @@ 
  */
 
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "console.h"
 #include "devices.h"
 #include "vga_int.h"
diff --git a/hw/bt-hci-csr.c b/hw/bt-hci-csr.c
index 65ffa37..d135ef4 100644
--- a/hw/bt-hci-csr.c
+++ b/hw/bt-hci-csr.c
@@ -22,7 +22,6 @@ 
 #include "qemu-char.h"
 #include "qemu-timer.h"
 #include "irq.h"
-#include "sysemu.h"
 #include "net.h"
 #include "bt.h"
 
diff --git a/hw/cris-boot.c b/hw/cris-boot.c
index 2ef17f6..37894f8 100644
--- a/hw/cris-boot.c
+++ b/hw/cris-boot.c
@@ -23,7 +23,6 @@ 
  */
 
 #include "hw.h"
-#include "sysemu.h"
 #include "loader.h"
 #include "elf.h"
 #include "cris-boot.h"
diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c
index 61efb39..cec1cc8 100644
--- a/hw/dummy_m68k.c
+++ b/hw/dummy_m68k.c
@@ -7,7 +7,6 @@ 
  */
 
 #include "hw.h"
-#include "sysemu.h"
 #include "boards.h"
 #include "loader.h"
 #include "elf.h"
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 5ee5f97..b84d74a 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -24,7 +24,6 @@ 
 
 #include "sysbus.h"
 #include "boards.h"
-#include "sysemu.h"
 #include "net.h"
 #include "flash.h"
 #include "etraxfs.h"
diff --git a/hw/gumstix.c b/hw/gumstix.c
index ee63f63..853f7e1 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -35,7 +35,6 @@ 
 #include "pxa.h"
 #include "net.h"
 #include "flash.h"
-#include "sysemu.h"
 #include "devices.h"
 #include "boards.h"
 #include "blockdev.h"
diff --git a/hw/ide/ich.c b/hw/ide/ich.c
index f242d7a..a3d475c 100644
--- a/hw/ide/ich.c
+++ b/hw/ide/ich.c
@@ -67,7 +67,6 @@ 
 #include <hw/isa.h>
 #include "block.h"
 #include "block_int.h"
-#include "sysemu.h"
 #include "dma.h"
 
 #include <hw/ide/pci.h>
diff --git a/hw/ide/isa.c b/hw/ide/isa.c
index 8c59c5a..4ac7453 100644
--- a/hw/ide/isa.c
+++ b/hw/ide/isa.c
@@ -27,7 +27,6 @@ 
 #include <hw/isa.h>
 #include "block.h"
 #include "block_int.h"
-#include "sysemu.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>
diff --git a/hw/ide/macio.c b/hw/ide/macio.c
index c1b4caa..7107f6b 100644
--- a/hw/ide/macio.c
+++ b/hw/ide/macio.c
@@ -27,7 +27,6 @@ 
 #include <hw/mac_dbdma.h>
 #include "block.h"
 #include "block_int.h"
-#include "sysemu.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c
index 2ceeb87..9fbbf0e 100644
--- a/hw/ide/microdrive.c
+++ b/hw/ide/microdrive.c
@@ -27,7 +27,6 @@ 
 #include <hw/pcmcia.h>
 #include "block.h"
 #include "block_int.h"
-#include "sysemu.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>
diff --git a/hw/ide/mmio.c b/hw/ide/mmio.c
index 82b24b6..10f6f40 100644
--- a/hw/ide/mmio.c
+++ b/hw/ide/mmio.c
@@ -25,7 +25,6 @@ 
 #include <hw/hw.h>
 #include "block.h"
 #include "block_int.h"
-#include "sysemu.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>
diff --git a/hw/ide/pci.c b/hw/ide/pci.c
index 35168cb..65cb56c 100644
--- a/hw/ide/pci.c
+++ b/hw/ide/pci.c
@@ -28,7 +28,6 @@ 
 #include <hw/isa.h>
 #include "block.h"
 #include "block_int.h"
-#include "sysemu.h"
 #include "dma.h"
 
 #include <hw/ide/pci.h>
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index b049940..a6c27be 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -10,7 +10,6 @@ 
 #include "sysbus.h"
 #include "primecell.h"
 #include "devices.h"
-#include "sysemu.h"
 #include "boards.h"
 #include "arm-misc.h"
 #include "net.h"
diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index d07aa41..2765543 100644
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -17,7 +17,6 @@ 
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "sysemu.h"
 #include "monitor.h"
 #include "sysbus.h"
 #include "isa.h"
diff --git a/hw/kvmclock.c b/hw/kvmclock.c
index b6ceddf..2678749 100644
--- a/hw/kvmclock.c
+++ b/hw/kvmclock.c
@@ -12,7 +12,6 @@ 
  */
 
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "sysbus.h"
 #include "kvm.h"
 #include "kvmclock.h"
diff --git a/hw/lan9118.c b/hw/lan9118.c
index af6949f..0e66509 100644
--- a/hw/lan9118.c
+++ b/hw/lan9118.c
@@ -10,9 +10,9 @@ 
 #include "sysbus.h"
 #include "net.h"
 #include "devices.h"
-#include "sysemu.h"
 /* For crc32 */
 #include <zlib.h>
+#include "qemu-timer.h"
 
 //#define DEBUG_LAN9118
 
diff --git a/hw/lm32_boards.c b/hw/lm32_boards.c
index 85190f0..6462923 100644
--- a/hw/lm32_boards.c
+++ b/hw/lm32_boards.c
@@ -21,7 +21,6 @@ 
 #include "hw.h"
 #include "net.h"
 #include "flash.h"
-#include "sysemu.h"
 #include "devices.h"
 #include "boards.h"
 #include "loader.h"
diff --git a/hw/mainstone.c b/hw/mainstone.c
index 50691ca..4792f0e 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -14,7 +14,6 @@ 
 #include "net.h"
 #include "devices.h"
 #include "boards.h"
-#include "sysemu.h"
 #include "flash.h"
 #include "blockdev.h"
 #include "sysbus.h"
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index 06bccbd..a7b687b 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -26,7 +26,6 @@ 
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "sysemu.h"
 #include "console.h"
 #include "omap.h"
 #include "boards.h"
diff --git a/hw/pc.c b/hw/pc.c
index 68076c6..560427d 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -38,7 +38,6 @@ 
 #include "mc146818rtc.h"
 #include "msix.h"
 #include "sysbus.h"
-#include "sysemu.h"
 #include "blockdev.h"
 #include "ui/qemu-spice.h"
 #include "machine-state.h"
diff --git a/hw/pci-stub.c b/hw/pci-stub.c
index 820992b..f262af6 100644
--- a/hw/pci-stub.c
+++ b/hw/pci-stub.c
@@ -18,7 +18,6 @@ 
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysemu.h"
 #include "monitor.h"
 #include "pci.h"
 #include "machine-state.h"
diff --git a/hw/pcie.c b/hw/pcie.c
index 6a113a9..0e9e07a 100644
--- a/hw/pcie.c
+++ b/hw/pcie.c
@@ -18,7 +18,7 @@ 
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "sysemu.h"
+#include "qemu-common.h"
 #include "range.h"
 #include "pci_bridge.h"
 #include "pcie.h"
diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
index 4dcdfbd..7a55b72 100644
--- a/hw/petalogix_s3adsp1800_mmu.c
+++ b/hw/petalogix_s3adsp1800_mmu.c
@@ -27,7 +27,6 @@ 
 #include "hw.h"
 #include "net.h"
 #include "flash.h"
-#include "sysemu.h"
 #include "devices.h"
 #include "boards.h"
 #include "device_tree.h"
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index 34ddf45..0a379b8 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -17,7 +17,6 @@ 
 #include "hw.h"
 #include "pci.h"
 #include "boards.h"
-#include "sysemu.h"
 #include "ppc440.h"
 #include "kvm.h"
 #include "kvm_ppc.h"
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index 5f581fe..7f9ed17 100644
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -24,7 +24,6 @@ 
 #include "hw.h"
 #include "ppc.h"
 #include "ppc4xx.h"
-#include "sysemu.h"
 #include "qemu-log.h"
 
 //#define DEBUG_MMIO
diff --git a/hw/qxl.c b/hw/qxl.c
index fe4212b..2deb87a 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -24,7 +24,6 @@ 
 #include "qemu-timer.h"
 #include "qemu-queue.h"
 #include "monitor.h"
-#include "sysemu.h"
 
 #include "qxl.h"
 
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index 784dc01..9a35743 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -19,7 +19,6 @@ 
 
 #include "hw.h"
 #include "block.h"
-#include "sysemu.h"
 #include "net.h"
 #include "boards.h"
 #include "monitor.h"
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 850422f..67ffd9e 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -20,7 +20,6 @@ 
 #include "hw.h"
 #include "block.h"
 #include "blockdev.h"
-#include "sysemu.h"
 #include "net.h"
 #include "boards.h"
 #include "monitor.h"
diff --git a/hw/stellaris.c b/hw/stellaris.c
index 0d52926..7932c24 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -14,7 +14,6 @@ 
 #include "qemu-timer.h"
 #include "i2c.h"
 #include "net.h"
-#include "sysemu.h"
 #include "boards.h"
 
 #define GPIO_A 0
diff --git a/hw/syborg.c b/hw/syborg.c
index 758c69a..bc200e4 100644
--- a/hw/syborg.c
+++ b/hw/syborg.c
@@ -25,7 +25,6 @@ 
 #include "sysbus.h"
 #include "boards.h"
 #include "arm-misc.h"
-#include "sysemu.h"
 #include "net.h"
 
 static struct arm_boot_info syborg_binfo;
diff --git a/hw/syborg_virtio.c b/hw/syborg_virtio.c
index ee08c49..2f3e6da 100644
--- a/hw/syborg_virtio.c
+++ b/hw/syborg_virtio.c
@@ -26,7 +26,6 @@ 
 #include "sysbus.h"
 #include "virtio.h"
 #include "virtio-net.h"
-#include "sysemu.h"
 
 //#define DEBUG_SYBORG_VIRTIO
 
diff --git a/hw/sysbus.c b/hw/sysbus.c
index acad72a..2e22be7 100644
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -18,7 +18,6 @@ 
  */
 
 #include "sysbus.h"
-#include "sysemu.h"
 #include "monitor.h"
 
 static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
diff --git a/hw/tc58128.c b/hw/tc58128.c
index 672a01c..61b99dd 100644
--- a/hw/tc58128.c
+++ b/hw/tc58128.c
@@ -1,6 +1,5 @@ 
 #include "hw.h"
 #include "sh.h"
-#include "sysemu.h"
 #include "loader.h"
 
 #define CE1  0x0100
diff --git a/hw/tosa.c b/hw/tosa.c
index b8b6c4f..a7967a2 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -11,7 +11,6 @@ 
 #include "hw.h"
 #include "pxa.h"
 #include "arm-misc.h"
-#include "sysemu.h"
 #include "devices.h"
 #include "sharpsl.h"
 #include "pcmcia.h"
diff --git a/hw/twl92230.c b/hw/twl92230.c
index 8e74acc..a75448f 100644
--- a/hw/twl92230.c
+++ b/hw/twl92230.c
@@ -22,7 +22,6 @@ 
 #include "hw.h"
 #include "qemu-timer.h"
 #include "i2c.h"
-#include "sysemu.h"
 #include "console.h"
 
 #define VERBOSE 1
diff --git a/hw/usb-hid.c b/hw/usb-hid.c
index c25362c..89c293c 100644
--- a/hw/usb-hid.c
+++ b/hw/usb-hid.c
@@ -26,7 +26,7 @@ 
 #include "console.h"
 #include "usb.h"
 #include "usb-desc.h"
-#include "sysemu.h"
+#include "qemu-timer.h"
 
 /* HID interface requests */
 #define GET_REPORT   0xa101
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c
index 8adddea..039ce08 100644
--- a/hw/virtio-balloon.c
+++ b/hw/virtio-balloon.c
@@ -15,7 +15,6 @@ 
 #include "qemu-common.h"
 #include "virtio.h"
 #include "pc.h"
-#include "sysemu.h"
 #include "cpu.h"
 #include "monitor.h"
 #include "balloon.h"
diff --git a/hw/virtio.c b/hw/virtio.c
index 31bd9e3..6e8814c 100644
--- a/hw/virtio.c
+++ b/hw/virtio.c
@@ -16,7 +16,6 @@ 
 #include "trace.h"
 #include "qemu-error.h"
 #include "virtio.h"
-#include "sysemu.h"
 
 /* The alignment to use between consumer and producer parts of vring.
  * x86 pagesize again. */
diff --git a/hw/virtio.h b/hw/virtio.h
index 8cff445..1968922 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -17,7 +17,6 @@ 
 #include "hw.h"
 #include "net.h"
 #include "qdev.h"
-#include "sysemu.h"
 #include "block_int.h"
 #include "event_notifier.h"
 #include "vm-state.h"
diff --git a/hw/vmport.c b/hw/vmport.c
index 19010e4..c8aefaa 100644
--- a/hw/vmport.c
+++ b/hw/vmport.c
@@ -24,7 +24,6 @@ 
 #include "hw.h"
 #include "isa.h"
 #include "pc.h"
-#include "sysemu.h"
 #include "kvm.h"
 #include "qdev.h"
 
diff --git a/hw/watchdog.c b/hw/watchdog.c
index c1dde67..e274f46 100644
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -25,7 +25,6 @@ 
 #include "qemu-queue.h"
 #include "qemu-objects.h"
 #include "monitor.h"
-#include "sysemu.h"
 #include "hw/watchdog.h"
 #include "vm-state.h"
 #include "machine-state.h"
diff --git a/hw/xen_backend.h b/hw/xen_backend.h
index 1b428e3..166980b 100644
--- a/hw/xen_backend.h
+++ b/hw/xen_backend.h
@@ -2,7 +2,6 @@ 
 #define QEMU_HW_XEN_BACKEND_H 1
 
 #include "xen_common.h"
-#include "sysemu.h"
 #include "net.h"
 
 /* ------------------------------------------------------------- */
diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
index 30827b0..d398c18 100644
--- a/hw/xilinx_timer.c
+++ b/hw/xilinx_timer.c
@@ -23,7 +23,6 @@ 
  */
 
 #include "sysbus.h"
-#include "sysemu.h"
 #include "qemu-timer.h"
 
 #define D(x)
diff --git a/kvm-stub.c b/kvm-stub.c
index 30f6ec3..1c95452 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -11,7 +11,6 @@ 
  */
 
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "hw/hw.h"
 #include "exec-all.h"
 #include "gdbstub.h"
diff --git a/m68k-semi.c b/m68k-semi.c
index 0371089..dd87a03 100644
--- a/m68k-semi.c
+++ b/m68k-semi.c
@@ -36,7 +36,6 @@ 
 #include "gdbstub.h"
 #include "softmmu-semi.h"
 #endif
-#include "sysemu.h"
 
 #define HOSTED_EXIT  0
 #define HOSTED_INIT_SIM 1
diff --git a/migration-exec.c b/migration-exec.c
index 14718dd..4b7aad8 100644
--- a/migration-exec.c
+++ b/migration-exec.c
@@ -17,7 +17,6 @@ 
 #include "qemu_socket.h"
 #include "migration.h"
 #include "qemu-char.h"
-#include "sysemu.h"
 #include "buffered_file.h"
 #include "block.h"
 #include <sys/types.h>
diff --git a/migration-fd.c b/migration-fd.c
index 6d14505..66d51c1 100644
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -16,7 +16,6 @@ 
 #include "migration.h"
 #include "monitor.h"
 #include "qemu-char.h"
-#include "sysemu.h"
 #include "buffered_file.h"
 #include "block.h"
 #include "qemu_socket.h"
diff --git a/migration-tcp.c b/migration-tcp.c
index e8dff9d..d3d80c9 100644
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -15,7 +15,6 @@ 
 #include "qemu_socket.h"
 #include "migration.h"
 #include "qemu-char.h"
-#include "sysemu.h"
 #include "buffered_file.h"
 #include "block.h"
 
diff --git a/migration-unix.c b/migration-unix.c
index 8b967f2..c8625c7 100644
--- a/migration-unix.c
+++ b/migration-unix.c
@@ -15,7 +15,6 @@ 
 #include "qemu_socket.h"
 #include "migration.h"
 #include "qemu-char.h"
-#include "sysemu.h"
 #include "buffered_file.h"
 #include "block.h"
 
diff --git a/monitor.c b/monitor.c
index cda8733..be236dd 100644
--- a/monitor.c
+++ b/monitor.c
@@ -35,7 +35,6 @@ 
 #include "net/slirp.h"
 #include "qemu-char.h"
 #include "ui/qemu-spice.h"
-#include "sysemu.h"
 #include "monitor.h"
 #include "readline.h"
 #include "console.h"
diff --git a/net.c b/net.c
index ddcca97..e413a18 100644
--- a/net.c
+++ b/net.c
@@ -32,7 +32,6 @@ 
 #include "net/vde.h"
 #include "net/util.h"
 #include "monitor.h"
-#include "sysemu.h"
 #include "qemu-common.h"
 #include "qemu_socket.h"
 #include "hw/qdev.h"
diff --git a/net/dump.c b/net/dump.c
index 83eda0f..0d0cbb2 100644
--- a/net/dump.c
+++ b/net/dump.c
@@ -24,9 +24,9 @@ 
 
 #include "dump.h"
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "qemu-error.h"
 #include "qemu-log.h"
+#include "qemu-timer.h"
 
 typedef struct DumpState {
     VLANClientState nc;
diff --git a/net/slirp.c b/net/slirp.c
index b41c60a..e387a11 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -30,7 +30,6 @@ 
 #endif
 #include "net.h"
 #include "monitor.h"
-#include "sysemu.h"
 #include "qemu_socket.h"
 #include "slirp/libslirp.h"
 
diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 2f3efde..f99a7a2 100644
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -24,7 +24,6 @@ 
 
 #include "net/tap.h"
 #include "qemu-common.h"
-#include "sysemu.h"
 #include "qemu-error.h"
 
 #ifdef __NetBSD__
diff --git a/net/tap-linux.c b/net/tap-linux.c
index ff8cad0..bd90a54 100644
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -29,7 +29,6 @@ 
 #include <net/if.h>
 #include <sys/ioctl.h>
 
-#include "sysemu.h"
 #include "qemu-common.h"
 #include "qemu-error.h"
 
diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index c216d28..7a65efd 100644
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -23,7 +23,6 @@ 
  */
 
 #include "net/tap.h"
-#include "sysemu.h"
 
 #include <sys/stat.h>
 #include <sys/ethernet.h>
diff --git a/net/tap-win32.c b/net/tap-win32.c
index 596132e..e9bb09d 100644
--- a/net/tap-win32.c
+++ b/net/tap-win32.c
@@ -30,7 +30,6 @@ 
 
 #include "qemu-common.h"
 #include "net.h"
-#include "sysemu.h"
 #include "qemu-error.h"
 #include <stdio.h>
 #include <windows.h>
diff --git a/net/tap.c b/net/tap.c
index b8cd252..5163e0b 100644
--- a/net/tap.c
+++ b/net/tap.c
@@ -35,7 +35,6 @@ 
 #include <net/if.h>
 
 #include "net.h"
-#include "sysemu.h"
 #include "qemu-char.h"
 #include "qemu-common.h"
 #include "qemu-error.h"
diff --git a/net/vde.c b/net/vde.c
index 0b46fa6..ac48ab2 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -31,7 +31,6 @@ 
 #include "qemu-char.h"
 #include "qemu-common.h"
 #include "qemu-option.h"
-#include "sysemu.h"
 
 typedef struct VDEState {
     VLANClientState nc;
diff --git a/os-posix.c b/os-posix.c
index e6097c6..1037b1b 100644
--- a/os-posix.c
+++ b/os-posix.c
@@ -35,7 +35,6 @@ 
 
 /* Needed early for CONFIG_BSD etc. */
 #include "config-host.h"
-#include "sysemu.h"
 #include "net/slirp.h"
 #include "qemu-options.h"
 #include "host-state.h"
diff --git a/os-win32.c b/os-win32.c
index d6d54c6..b7c752a 100644
--- a/os-win32.c
+++ b/os-win32.c
@@ -30,7 +30,6 @@ 
 #include <errno.h>
 #include <sys/time.h>
 #include "config-host.h"
-#include "sysemu.h"
 #include "qemu-options.h"
 
 /***********************************************************/
diff --git a/osdep.c b/osdep.c
index 327583b..56e6963 100644
--- a/osdep.c
+++ b/osdep.c
@@ -46,7 +46,6 @@  extern int madvise(caddr_t, size_t, int);
 
 #include "qemu-common.h"
 #include "trace.h"
-#include "sysemu.h"
 #include "qemu_socket.h"
 
 int qemu_madvise(void *addr, size_t len, int advice)
diff --git a/oslib-posix.c b/oslib-posix.c
index 7bc5f7c..82989ea 100644
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -27,7 +27,6 @@ 
  */
 
 #include "config-host.h"
-#include "sysemu.h"
 #include "trace.h"
 #include "qemu_socket.h"
 
diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 6d4df9d..0897e53 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -24,7 +24,6 @@ 
 
 #include "qemu-queue.h"
 #include "osdep.h"
-#include "sysemu.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "block_int.h"
diff --git a/qemu-common.h b/qemu-common.h
index 2c70044..2e5f52c 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -40,6 +40,15 @@  typedef struct Monitor Monitor;
 #include <sys/time.h>
 #include <assert.h>
 
+#ifdef _WIN32
+#include <windows.h>
+#include "qemu-os-win32.h"
+#endif
+
+#ifdef CONFIG_POSIX
+#include "qemu-os-posix.h"
+#endif
+
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
 #endif
@@ -335,6 +344,11 @@  void qemu_iovec_memset_skip(QEMUIOVector *qiov, int c, size_t count,
 #define QEMU_FILE_TYPE_KEYMAP 1
 char *qemu_find_file(int type, const char *name);
 
+/* OS specific functions */
+void os_setup_early_signal_handling(void);
+char *os_find_datadir(const char *argv0);
+void os_parse_cmd_args(int index, const char *optarg);
+void os_pidfile_error(void);
 
 /* Convert a byte between binary and BCD.  */
 static inline uint8_t to_bcd(uint8_t val)
diff --git a/qemu-config.c b/qemu-config.c
index 323d3c2..14d3419 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -2,7 +2,6 @@ 
 #include "qemu-error.h"
 #include "qemu-option.h"
 #include "qemu-config.h"
-#include "sysemu.h"
 #include "hw/qdev.h"
 
 static QemuOptsList qemu_drive_opts = {
diff --git a/qemu-error.c b/qemu-error.c
index 5a35e7c..41c191d 100644
--- a/qemu-error.c
+++ b/qemu-error.c
@@ -12,7 +12,6 @@ 
 
 #include <stdio.h>
 #include "monitor.h"
-#include "sysemu.h"
 
 /*
  * Print to current monitor if we have one, else to stderr.
diff --git a/qemu-img.c b/qemu-img.c
index 7e3cc4c..b413e7d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -25,7 +25,6 @@ 
 #include "qemu-option.h"
 #include "qemu-error.h"
 #include "osdep.h"
-#include "sysemu.h"
 #include "block_int.h"
 #include <stdio.h>
 
diff --git a/qemu-timer.c b/qemu-timer.c
index b1cc013..802d3c9 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -22,7 +22,6 @@ 
  * THE SOFTWARE.
  */
 
-#include "sysemu.h"
 #include "net.h"
 #include "monitor.h"
 #include "console.h"
diff --git a/qemu-timer.h b/qemu-timer.h
index 75d5675..4738e99 100644
--- a/qemu-timer.h
+++ b/qemu-timer.h
@@ -58,6 +58,10 @@  void init_clocks(void);
 int init_timer_alarm(void);
 void quit_timers(void);
 
+int64_t cpu_get_ticks(void);
+void cpu_enable_ticks(void);
+void cpu_disable_ticks(void);
+
 static inline QEMUTimer *qemu_new_timer_ns(QEMUClock *clock, QEMUTimerCB *cb,
                                            void *opaque)
 {
diff --git a/qemu-tool.c b/qemu-tool.c
index d45840d..f4a6ad0 100644
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -15,7 +15,6 @@ 
 #include "monitor.h"
 #include "qemu-timer.h"
 #include "qemu-log.h"
-#include "sysemu.h"
 
 #include <sys/time.h>
 
diff --git a/savevm.c b/savevm.c
index 418fb97..7d4275e 100644
--- a/savevm.c
+++ b/savevm.c
@@ -75,7 +75,6 @@ 
 #include "hw/qdev.h"
 #include "net.h"
 #include "monitor.h"
-#include "sysemu.h"
 #include "qemu-timer.h"
 #include "qemu-char.h"
 #include "audio/audio.h"
@@ -83,6 +82,7 @@ 
 #include "qemu_socket.h"
 #include "qemu-queue.h"
 #include "vm-state.h"
+#include "cpus.h"
 
 #define SELF_ANNOUNCE_ROUNDS 5
 
diff --git a/sysemu.h b/sysemu.h
deleted file mode 100644
index a27da92..0000000
--- a/sysemu.h
+++ /dev/null
@@ -1,35 +0,0 @@ 
-#ifndef SYSEMU_H
-#define SYSEMU_H
-/* Misc. things related to the system emulator.  */
-
-#include "qemu-common.h"
-#include "qemu-option.h"
-#include "qemu-queue.h"
-#include "qemu-timer.h"
-#include "notify.h"
-
-#ifdef _WIN32
-#include <windows.h>
-#include "qemu-os-win32.h"
-#endif
-
-#ifdef CONFIG_POSIX
-#include "qemu-os-posix.h"
-#endif
-
-/* vl.c */
-int64_t cpu_get_ticks(void);
-void cpu_enable_ticks(void);
-void cpu_disable_ticks(void);
-
-void cpu_synchronize_all_states(void);
-void cpu_synchronize_all_post_reset(void);
-void cpu_synchronize_all_post_init(void);
-
-/* OS specific functions */
-void os_setup_early_signal_handling(void);
-char *os_find_datadir(const char *argv0);
-void os_parse_cmd_args(int index, const char *optarg);
-void os_pidfile_error(void);
-
-#endif
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 0e2e67b..843a6f9 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -21,7 +21,6 @@ 
 
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "sysemu.h"
 #include "kvm.h"
 #include "kvm_ppc.h"
 #include "cpu.h"
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 9123203..628a420 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -26,7 +26,6 @@ 
 
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "sysemu.h"
 #include "kvm.h"
 #include "cpu.h"
 #include "device_tree.h"
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 20f91bc..3b7426b 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -26,7 +26,6 @@ 
 
 #include "qemu-common.h"
 #include "console.h"
-#include "sysemu.h"
 
 #ifndef MAC_OS_X_VERSION_10_4
 #define MAC_OS_X_VERSION_10_4 1040
diff --git a/ui/keymaps.c b/ui/keymaps.c
index 78c7ea3..92fb161 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -23,7 +23,6 @@ 
  */
 
 #include "keymaps.h"
-#include "sysemu.h"
 
 static int get_keysym(const name2keysym_t *table,
 		      const char *name)
diff --git a/ui/sdl.c b/ui/sdl.c
index b0976be..91cd2b1 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -34,7 +34,6 @@ 
 
 #include "qemu-common.h"
 #include "console.h"
-#include "sysemu.h"
 #include "x_keymap.h"
 #include "sdl_zoom.h"
 #include "host-state.h"
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 020b423..0d4492b 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -23,7 +23,6 @@ 
 #include "qemu-queue.h"
 #include "monitor.h"
 #include "console.h"
-#include "sysemu.h"
 
 #include "spice-display.h"
 
diff --git a/vl.c b/vl.c
index 52e121a..5a229c7 100644
--- a/vl.c
+++ b/vl.c
@@ -129,7 +129,6 @@  int main(int argc, char **argv)
 #include "net/slirp.h"
 #include "monitor.h"
 #include "console.h"
-#include "sysemu.h"
 #include "gdbstub.h"
 #include "qemu-timer.h"
 #include "qemu-char.h"
-- 
1.7.2.5