diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:39:34 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:40:49 +0100 |
| commit | 501a7ce7270955be151c442c27620fa7af2f3ce5 (patch) | |
| tree | 0374e4d581a0246074d55712b81baf01f3c439b6 /monitor.c | |
| parent | 62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff) | |
| parent | 36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff) | |
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
Adapt header include paths.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 52 |
1 files changed, 26 insertions, 26 deletions
@@ -27,35 +27,35 @@ #include "hw/usb.h" #include "hw/pcmcia.h" #include "hw/pc.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/watchdog.h" #include "hw/loader.h" -#include "gdbstub.h" -#include "net.h" +#include "exec/gdbstub.h" +#include "net/net.h" #include "net/slirp.h" -#include "qemu-char.h" +#include "char/char.h" #include "ui/qemu-spice.h" -#include "sysemu.h" -#include "monitor.h" -#include "readline.h" -#include "console.h" -#include "blockdev.h" +#include "sysemu/sysemu.h" +#include "monitor/monitor.h" +#include "monitor/readline.h" +#include "ui/console.h" +#include "sysemu/blockdev.h" #include "audio/audio.h" -#include "disas.h" -#include "balloon.h" -#include "qemu-timer.h" -#include "migration.h" -#include "kvm.h" -#include "acl.h" -#include "qint.h" -#include "qfloat.h" -#include "qlist.h" -#include "qbool.h" -#include "qstring.h" -#include "qjson.h" -#include "json-streamer.h" -#include "json-parser.h" -#include "osdep.h" +#include "disas/disas.h" +#include "sysemu/balloon.h" +#include "qemu/timer.h" +#include "migration/migration.h" +#include "sysemu/kvm.h" +#include "qemu/acl.h" +#include "qapi/qmp/qint.h" +#include "qapi/qmp/qfloat.h" +#include "qapi/qmp/qlist.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" +#include "qapi/qmp/qjson.h" +#include "qapi/qmp/json-streamer.h" +#include "qapi/qmp/json-parser.h" +#include "qemu/osdep.h" #include "cpu.h" #include "trace.h" #include "trace/control.h" @@ -63,10 +63,10 @@ #include "trace/simple.h" #endif #include "ui/qemu-spice.h" -#include "memory.h" +#include "exec/memory.h" #include "qmp-commands.h" #include "hmp.h" -#include "qemu-thread.h" +#include "qemu/thread.h" /* for pic/irq_info */ #if defined(TARGET_SPARC) |