monitor: move include files to include/monitor/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-12-17 18:19:49 +01:00
parent 022c62cbbc
commit 83c9089e73
84 changed files with 87 additions and 87 deletions

View File

@ -29,7 +29,7 @@
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
#include "config.h" #include "config.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "bitops.h" #include "bitops.h"
#include "bitmap.h" #include "bitmap.h"

View File

@ -23,7 +23,7 @@
*/ */
#include "hw/hw.h" #include "hw/hw.h"
#include "audio.h" #include "audio.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "sysemu.h" #include "sysemu.h"

View File

@ -1,5 +1,5 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "audio.h" #include "audio.h"
typedef struct { typedef struct {

View File

@ -24,7 +24,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "monitor.h" #include "monitor/monitor.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "kvm.h" #include "kvm.h"
#include "balloon.h" #include "balloon.h"

View File

@ -14,7 +14,7 @@
#ifndef _QEMU_BALLOON_H #ifndef _QEMU_BALLOON_H
#define _QEMU_BALLOON_H #define _QEMU_BALLOON_H
#include "monitor.h" #include "monitor/monitor.h"
#include "qapi-types.h" #include "qapi-types.h"
typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target); typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target);

View File

@ -24,7 +24,7 @@
#include "config-host.h" #include "config-host.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "trace.h" #include "trace.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "block/block_int.h" #include "block/block_int.h"
#include "block/blockjob.h" #include "block/blockjob.h"
#include "module.h" #include "module.h"

View File

@ -11,7 +11,7 @@
#include "blockdev.h" #include "blockdev.h"
#include "hw/block-common.h" #include "hw/block-common.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "sysemu.h" #include "sysemu.h"
#include "qmp-commands.h" #include "qmp-commands.h"

View File

@ -10,7 +10,7 @@
#include "blockdev.h" #include "blockdev.h"
#include "hw/block-common.h" #include "hw/block-common.h"
#include "block/blockjob.h" #include "block/blockjob.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qemu-option.h" #include "qemu-option.h"
#include "qemu-config.h" #include "qemu-config.h"

View File

@ -26,7 +26,7 @@
#include "config-host.h" #include "config-host.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "trace.h" #include "trace.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "block/block.h" #include "block/block.h"
#include "block/blockjob.h" #include "block/blockjob.h"
#include "block/block_int.h" #include "block/block_int.h"

2
cpus.c
View File

@ -25,7 +25,7 @@
/* Needed early for CONFIG_BSD etc. */ /* Needed early for CONFIG_BSD etc. */
#include "config-host.h" #include "config-host.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "exec/gdbstub.h" #include "exec/gdbstub.h"
#include "dma.h" #include "dma.h"

View File

@ -374,7 +374,7 @@ const char *lookup_symbol(target_ulong orig_addr)
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
#include "monitor.h" #include "monitor/monitor.h"
static int monitor_disas_is_physical; static int monitor_disas_is_physical;

2
dump.c
View File

@ -16,7 +16,7 @@
#include "cpu.h" #include "cpu.h"
#include "exec/cpu-all.h" #include "exec/cpu-all.h"
#include "exec/hwaddr.h" #include "exec/hwaddr.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "kvm.h" #include "kvm.h"
#include "dump.h" #include "dump.h"
#include "sysemu.h" #include "sysemu.h"

View File

@ -29,7 +29,7 @@
#include "qemu.h" #include "qemu.h"
#else #else
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu-char.h" #include "qemu-char.h"
#include "sysemu.h" #include "sysemu.h"
#include "exec/gdbstub.h" #include "exec/gdbstub.h"

2
hmp.c
View File

@ -20,7 +20,7 @@
#include "qemu-timer.h" #include "qemu-timer.h"
#include "qmp-commands.h" #include "qmp-commands.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "ui/console.h" #include "ui/console.h"
static void hmp_handle_error(Monitor *mon, Error **errp) static void hmp_handle_error(Monitor *mon, Error **errp)

View File

@ -22,7 +22,7 @@
#include "hw.h" #include "hw.h"
#include "pc.h" #include "pc.h"
#include "acpi.h" #include "acpi.h"
#include "monitor.h" #include "monitor/monitor.h"
struct acpi_table_header { struct acpi_table_header {
uint16_t _length; /* our length, not actual part of the hdr */ uint16_t _length; /* our length, not actual part of the hdr */

View File

@ -33,7 +33,7 @@
#include "qemu-thread.h" #include "qemu-thread.h"
#include "qemu-char.h" #include "qemu-char.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "hw/ccid.h" #include "hw/ccid.h"
#define DPRINTF(card, lvl, fmt, ...) \ #define DPRINTF(card, lvl, fmt, ...) \

View File

@ -10,7 +10,7 @@
#include "qemu-char.h" #include "qemu-char.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "hw/ccid.h" #include "hw/ccid.h"
#include "libcacard/vscard_common.h" #include "libcacard/vscard_common.h"

View File

@ -27,7 +27,7 @@
#include "blockdev.h" #include "blockdev.h"
#include "qemu-config.h" #include "qemu-config.h"
#include "sysemu.h" #include "sysemu.h"
#include "monitor.h" #include "monitor/monitor.h"
DriveInfo *add_init_drive(const char *optstr) DriveInfo *add_init_drive(const char *optstr)
{ {

View File

@ -24,7 +24,7 @@
#include "hw.h" #include "hw.h"
#include "pc.h" #include "pc.h"
#include "isa.h" #include "isa.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "i8259_internal.h" #include "i8259_internal.h"

View File

@ -27,7 +27,7 @@
#include <hw/pci/pci.h> #include <hw/pci/pci.h>
#include <hw/sysbus.h> #include <hw/sysbus.h>
#include "monitor.h" #include "monitor/monitor.h"
#include "dma.h" #include "dma.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "internal.h" #include "internal.h"

View File

@ -17,7 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "hw.h" #include "hw.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysbus.h" #include "sysbus.h"
#include "sysemu.h" #include "sysemu.h"
#include "isa.h" #include "isa.h"

View File

@ -31,7 +31,7 @@
#include "qemu-error.h" #include "qemu-error.h"
#include "ui/console.h" #include "ui/console.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "range.h" #include "range.h"
#include "sysemu.h" #include "sysemu.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"

View File

@ -21,7 +21,7 @@
#include "hw.h" #include "hw.h"
#include "pc.h" #include "pc.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysbus.h" #include "sysbus.h"
#include "trace.h" #include "trace.h"
#include "lm32_pic.h" #include "lm32_pic.h"

View File

@ -44,7 +44,7 @@
#include "hw.h" #include "hw.h"
#include "disas/disas.h" #include "disas/disas.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "uboot_image.h" #include "uboot_image.h"
#include "loader.h" #include "loader.h"

View File

@ -28,7 +28,7 @@
#include "fdc.h" #include "fdc.h"
#include "ide.h" #include "ide.h"
#include "pci/pci.h" #include "pci/pci.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "fw_cfg.h" #include "fw_cfg.h"
#include "hpet_emul.h" #include "hpet_emul.h"
#include "smbios.h" #include "smbios.h"

View File

@ -27,7 +27,7 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "net/net.h" #include "net/net.h"
#include "hw/pc.h" #include "hw/pc.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "hw/scsi.h" #include "hw/scsi.h"
#include "hw/virtio-blk.h" #include "hw/virtio-blk.h"
#include "qemu-config.h" #include "qemu-config.h"

View File

@ -19,7 +19,7 @@
*/ */
#include "sysemu.h" #include "sysemu.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "qmp-commands.h" #include "qmp-commands.h"

View File

@ -25,7 +25,7 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bridge.h"
#include "hw/pci/pci_bus.h" #include "hw/pci/pci_bus.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "net/net.h" #include "net/net.h"
#include "sysemu.h" #include "sysemu.h"
#include "hw/loader.h" #include "hw/loader.h"

View File

@ -20,7 +20,7 @@
#include "sysemu.h" #include "sysemu.h"
#include "qapi/qmp/types.h" #include "qapi/qmp/types.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "hw/pci/pci_bridge.h" #include "hw/pci/pci_bridge.h"
#include "hw/pci/pcie.h" #include "hw/pci/pcie.h"
#include "hw/pci/msix.h" #include "hw/pci/msix.h"

View File

@ -18,7 +18,7 @@
*/ */
#include "qdev.h" #include "qdev.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qmp-commands.h" #include "qmp-commands.h"
#include "arch_init.h" #include "arch_init.h"
#include "qemu-config.h" #include "qemu-config.h"

View File

@ -2,7 +2,7 @@
#define QEMU_QDEV_MONITOR_H #define QEMU_QDEV_MONITOR_H
#include "qdev-core.h" #include "qdev-core.h"
#include "monitor.h" #include "monitor/monitor.h"
/*** monitor commands ***/ /*** monitor commands ***/

View File

@ -23,7 +23,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "qemu-queue.h" #include "qemu-queue.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "trace.h" #include "trace.h"

View File

@ -21,7 +21,7 @@
#include "block/block.h" #include "block/block.h"
#include "sysemu.h" #include "sysemu.h"
#include "boards.h" #include "boards.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "loader.h" #include "loader.h"
#include "elf.h" #include "elf.h"
#include "hw/virtio.h" #include "hw/virtio.h"

View File

@ -23,7 +23,7 @@
#include "sysemu.h" #include "sysemu.h"
#include "net/net.h" #include "net/net.h"
#include "boards.h" #include "boards.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "loader.h" #include "loader.h"
#include "elf.h" #include "elf.h"
#include "hw/virtio.h" #include "hw/virtio.h"

View File

@ -15,7 +15,7 @@
* *
*/ */
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "sclp.h" #include "sclp.h"

View File

@ -23,7 +23,7 @@
*/ */
#include "sun4m.h" #include "sun4m.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysbus.h" #include "sysbus.h"
#include "trace.h" #include "trace.h"

View File

@ -22,7 +22,7 @@
#include "hw.h" #include "hw.h"
#include "sysemu.h" #include "sysemu.h"
#include "boards.h" #include "boards.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "loader.h" #include "loader.h"
#include "elf.h" #include "elf.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"

View File

@ -24,7 +24,7 @@
#include "hw.h" #include "hw.h"
#include "sun4m.h" #include "sun4m.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysbus.h" #include "sysbus.h"
//#define DEBUG_IRQ_COUNT //#define DEBUG_IRQ_COUNT

View File

@ -18,7 +18,7 @@
*/ */
#include "sysbus.h" #include "sysbus.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent); static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);

View File

@ -2,7 +2,7 @@
#include "hw/usb.h" #include "hw/usb.h"
#include "hw/qdev.h" #include "hw/qdev.h"
#include "sysemu.h" #include "sysemu.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "trace.h" #include "trace.h"
static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent); static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent);

View File

@ -38,7 +38,7 @@
#include "qemu-error.h" #include "qemu-error.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "hw/usb/desc.h" #include "hw/usb/desc.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "hw/ccid.h" #include "hw/ccid.h"

View File

@ -14,7 +14,7 @@
#include "hw/usb/desc.h" #include "hw/usb/desc.h"
#include "hw/scsi.h" #include "hw/scsi.h"
#include "ui/console.h" #include "ui/console.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "blockdev.h" #include "blockdev.h"

View File

@ -20,7 +20,7 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "trace.h" #include "trace.h"
#include "dma.h" #include "dma.h"
#include "sysemu.h" #include "sysemu.h"

View File

@ -25,7 +25,7 @@
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "hw/usb.h" #include "hw/usb.h"
/* usb.h declares these */ /* usb.h declares these */

View File

@ -32,7 +32,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "trace.h" #include "trace.h"

View File

@ -33,7 +33,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "ui/console.h" #include "ui/console.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "monitor.h" #include "monitor/monitor.h"
void usb_host_info(Monitor *mon) void usb_host_info(Monitor *mon)
{ {

View File

@ -27,7 +27,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "iov.h" #include "iov.h"

View File

@ -19,7 +19,7 @@
*/ */
#include "iov.h" #include "iov.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu-queue.h" #include "qemu-queue.h"
#include "sysbus.h" #include "sysbus.h"
#include "trace.h" #include "trace.h"

View File

@ -24,7 +24,7 @@
#include "qemu-config.h" #include "qemu-config.h"
#include "qemu-queue.h" #include "qemu-queue.h"
#include "qapi/qmp/types.h" #include "qapi/qmp/types.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "hw/watchdog.h" #include "hw/watchdog.h"

View File

@ -31,7 +31,7 @@
#include "qemu-timer.h" #include "qemu-timer.h"
#include "qapi-types.h" #include "qapi-types.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "monitor.h" #include "monitor/monitor.h"
#define BLOCK_FLAG_ENCRYPT 1 #define BLOCK_FLAG_ENCRYPT 1
#define BLOCK_FLAG_COMPAT6 4 #define BLOCK_FLAG_COMPAT6 4

View File

@ -5,7 +5,7 @@
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "block/block.h" #include "block/block.h"
#include "readline.h" #include "monitor/readline.h"
extern Monitor *cur_mon; extern Monitor *cur_mon;
extern Monitor *default_mon; extern Monitor *default_mon;

View File

@ -4,7 +4,7 @@
#include "ui/qemu-pixman.h" #include "ui/qemu-pixman.h"
#include "qapi/qmp/qdict.h" #include "qapi/qmp/qdict.h"
#include "notify.h" #include "notify.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "trace.h" #include "trace.h"
#include "qapi-types.h" #include "qapi-types.h"
#include "qapi/error.h" #include "qapi/error.h"

View File

@ -24,7 +24,7 @@
#include "qemu-option.h" #include "qemu-option.h"
#include "qemu-config.h" #include "qemu-config.h"
#include "monitor.h" #include "monitor/monitor.h"
extern int using_spice; extern int using_spice;
@ -47,7 +47,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data);
CharDriverState *qemu_chr_open_spice(QemuOpts *opts); CharDriverState *qemu_chr_open_spice(QemuOpts *opts);
#else /* CONFIG_SPICE */ #else /* CONFIG_SPICE */
#include "monitor.h" #include "monitor/monitor.h"
#define using_spice 0 #define using_spice 0
static inline int qemu_spice_set_passwd(const char *passwd, static inline int qemu_spice_set_passwd(const char *passwd,

View File

@ -16,7 +16,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "migration.h" #include "migration.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "buffered_file.h" #include "buffered_file.h"
#include "block/block.h" #include "block/block.h"
#include "qemu_socket.h" #include "qemu_socket.h"

View File

@ -15,7 +15,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "migration.h" #include "migration.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "buffered_file.h" #include "buffered_file.h"
#include "sysemu.h" #include "sysemu.h"
#include "block/block.h" #include "block/block.h"

View File

@ -36,8 +36,8 @@
#include "qemu-char.h" #include "qemu-char.h"
#include "ui/qemu-spice.h" #include "ui/qemu-spice.h"
#include "sysemu.h" #include "sysemu.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "readline.h" #include "monitor/readline.h"
#include "ui/console.h" #include "ui/console.h"
#include "blockdev.h" #include "blockdev.h"
#include "audio/audio.h" #include "audio/audio.h"

View File

@ -12,7 +12,7 @@
* *
*/ */
#include "monitor.h" #include "monitor/monitor.h"
#include "net/net.h" #include "net/net.h"
#include "clients.h" #include "clients.h"
#include "hub.h" #include "hub.h"

View File

@ -29,7 +29,7 @@
#include "net/slirp.h" #include "net/slirp.h"
#include "util.h" #include "util.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "qemu-config.h" #include "qemu-config.h"

View File

@ -32,7 +32,7 @@
#include "net/net.h" #include "net/net.h"
#include "clients.h" #include "clients.h"
#include "hub.h" #include "hub.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "slirp/libslirp.h" #include "slirp/libslirp.h"
#include "qemu-char.h" #include "qemu-char.h"

View File

@ -25,7 +25,7 @@
#include "net/net.h" #include "net/net.h"
#include "clients.h" #include "clients.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-error.h" #include "qemu-error.h"
#include "qemu-option.h" #include "qemu-option.h"

View File

@ -35,7 +35,7 @@
#include "net/net.h" #include "net/net.h"
#include "clients.h" #include "clients.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu-error.h" #include "qemu-error.h"

View File

@ -48,7 +48,7 @@ extern int madvise(caddr_t, size_t, int);
#include "qemu-common.h" #include "qemu-common.h"
#include "trace.h" #include "trace.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "monitor.h" #include "monitor/monitor.h"
static bool fips_enabled = false; static bool fips_enabled = false;

View File

@ -22,7 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "ui/console.h" #include "ui/console.h"
#include "sysemu.h" #include "sysemu.h"
#include "qemu-timer.h" #include "qemu-timer.h"

View File

@ -11,7 +11,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include "monitor.h" #include "monitor/monitor.h"
/* /*
* Print to current monitor if we have one, else to stderr. * Print to current monitor if we have one, else to stderr.

View File

@ -22,7 +22,7 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu_socket.h" #include "qemu_socket.h"
#include "qemu-common.h" /* for qemu_isdigit */ #include "qemu-common.h" /* for qemu_isdigit */
#include "main-loop.h" #include "main-loop.h"

View File

@ -23,7 +23,7 @@
*/ */
#include "sysemu.h" #include "sysemu.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "ui/console.h" #include "ui/console.h"
#include "hw/hw.h" #include "hw/hw.h"

View File

@ -14,7 +14,7 @@
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "qemu-log.h" #include "qemu-log.h"
#include "migration.h" #include "migration.h"

View File

@ -19,7 +19,7 @@
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
Monitor *cur_mon; Monitor *cur_mon;

View File

@ -10,7 +10,7 @@
* See the COPYING.LIB file in the top-level directory. * See the COPYING.LIB file in the top-level directory.
*/ */
#include "monitor.h" #include "monitor/monitor.h"
#include "qapi/qmp/qjson.h" #include "qapi/qmp/qjson.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qemu-common.h" #include "qemu-common.h"

View File

@ -21,8 +21,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "readline.h" #include "monitor/readline.h"
#include "monitor.h" #include "monitor/monitor.h"
#define IS_NORM 0 #define IS_NORM 0
#define IS_ESC 1 #define IS_ESC 1

View File

@ -73,7 +73,7 @@
#include "hw/hw.h" #include "hw/hw.h"
#include "hw/qdev.h" #include "hw/qdev.h"
#include "net/net.h" #include "net/net.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "sysemu.h" #include "sysemu.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "audio/audio.h" #include "audio/audio.h"

View File

@ -8,7 +8,7 @@
#include <slirp.h> #include <slirp.h>
#include <libslirp.h> #include <libslirp.h>
#include "monitor.h" #include "monitor/monitor.h"
#ifdef DEBUG #ifdef DEBUG
int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR; int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
@ -242,7 +242,7 @@ strdup(str)
} }
#endif #endif
#include "monitor.h" #include "monitor/monitor.h"
void lprint(const char *format, ...) void lprint(const char *format, ...)
{ {

View File

@ -1,5 +1,5 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd) int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
{ {

View File

@ -1,5 +1,5 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
int monitor_fdset_dup_fd_find(int dup_fd) int monitor_fdset_dup_fd_find(int dup_fd)
{ {

View File

@ -1,5 +1,5 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
int monitor_fdset_get_fd(int64_t fdset_id, int flags) int monitor_fdset_get_fd(int64_t fdset_id, int flags)
{ {

View File

@ -1,5 +1,5 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
int monitor_fdset_dup_fd_remove(int dupfd) int monitor_fdset_dup_fd_remove(int dupfd)
{ {

View File

@ -1,5 +1,5 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "monitor.h" #include "monitor/monitor.h"
int monitor_get_fd(Monitor *mon, const char *name, Error **errp) int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
{ {

View File

@ -21,7 +21,7 @@
#include "kvm.h" #include "kvm.h"
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
#include "sysemu.h" #include "sysemu.h"
#include "monitor.h" #include "monitor/monitor.h"
#endif #endif
//#define DEBUG_MMU //#define DEBUG_MMU

View File

@ -23,7 +23,7 @@
*/ */
#include "sysemu.h" #include "sysemu.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "ui/console.h" #include "ui/console.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qmp-commands.h" #include "qmp-commands.h"

View File

@ -35,7 +35,7 @@
#include "qapi/qmp/qjson.h" #include "qapi/qmp/qjson.h"
#include "notify.h" #include "notify.h"
#include "migration.h" #include "migration.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "hw/hw.h" #include "hw/hw.h"
#include "ui/spice-display.h" #include "ui/spice-display.h"

View File

@ -19,7 +19,7 @@
#include "ui/qemu-spice.h" #include "ui/qemu-spice.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "qemu-queue.h" #include "qemu-queue.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "ui/console.h" #include "ui/console.h"
#include "sysemu.h" #include "sysemu.h"
#include "trace.h" #include "trace.h"

View File

@ -31,7 +31,7 @@
#include "qemu-queue.h" #include "qemu-queue.h"
#include "qemu-thread.h" #include "qemu-thread.h"
#include "ui/console.h" #include "ui/console.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "audio/audio.h" #include "audio/audio.h"
#include "bitmap.h" #include "bitmap.h"
#include <zlib.h> #include <zlib.h>

2
vl.c
View File

@ -129,7 +129,7 @@ int main(int argc, char **argv)
#include "bt-host.h" #include "bt-host.h"
#include "net/net.h" #include "net/net.h"
#include "net/slirp.h" #include "net/slirp.h"
#include "monitor.h" #include "monitor/monitor.h"
#include "ui/console.h" #include "ui/console.h"
#include "sysemu.h" #include "sysemu.h"
#include "exec/gdbstub.h" #include "exec/gdbstub.h"