monitor: move include files to include/monitor/

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

diff --git a/arch_init.c b/arch_init.c
index e15cedad04cd689be92b4c578d4adcc65b6f09f9..93d1e52f4a9fa02f4c1599cb65d37fb7720f331e 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -29,7 +29,7 @@
 #include <sys/mman.h>
 #endif
 #include "config.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "bitops.h"
 #include "bitmap.h"

diff --git a/audio/audio.c b/audio/audio.c
index 1c7738930b639964b8020411579bc7b95b2b979e..a0cc72702083a1579086d65c091f26a773c4f5fd 100644 (file)
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -23,7 +23,7 @@
  */
 #include "hw/hw.h"
 #include "audio.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-timer.h"
 #include "sysemu.h"
 

diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 4f785f5f49e01e8fe3fc2913d29998d360cfd5ff..9d94623225b286e6cd3f5f8fefe8b9cca34f2908 100644 (file)
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,5 +1,5 @@
 #include "hw/hw.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "audio.h"
 
 typedef struct {

diff --git a/balloon.c b/balloon.c
index c24458b5f9cebcbecdba0a2bb07f13e44bc5f44c..d1de4352b47407daf6d583a95fc480c348e57e90 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "exec/cpu-common.h"
 #include "kvm.h"
 #include "balloon.h"

diff --git a/balloon.h b/balloon.h
index b803a00741fcbed730c7efcc5473c83885234c3d..bd9d39505d4e2010007088d6aa966c4381e69679 100644 (file)
--- a/balloon.h
+++ b/balloon.h
@@ -14,7 +14,7 @@
 #ifndef _QEMU_BALLOON_H
 #define _QEMU_BALLOON_H
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qapi-types.h"
 
 typedef void (QEMUBalloonEvent)(void *opaque, ram_addr_t target);

diff --git a/block.c b/block.c
index 5eab9e2519792b46cd6466978a0c414f76204cb3..0e7f18c6d347c4146198acd4aff63d2979322b21 100644 (file)
--- a/block.c
+++ b/block.c
@@ -24,7 +24,7 @@
 #include "config-host.h"
 #include "qemu-common.h"
 #include "trace.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
 #include "module.h"

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index 81aa1d34eff6c89f06f0d248210a62b747725f48..596b47499d5b9a9e77eea7f7a5e7f1cbb36ca190 100644 (file)
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -11,7 +11,7 @@
 
 #include "blockdev.h"
 #include "hw/block-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu.h"
 #include "qmp-commands.h"

diff --git a/blockdev.c b/blockdev.c
index ff6b333f694231eb4e4c5226c0f694e4d4b3ea01..a2308fa718199a514a7d6efd8ce112ed4027ee09 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -10,7 +10,7 @@
 #include "blockdev.h"
 #include "hw/block-common.h"
 #include "block/blockjob.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu-option.h"
 #include "qemu-config.h"

diff --git a/blockjob.c b/blockjob.c
index 004480d714118fe2aa090199330b490a3fbb9265..4bc60c737844b3607193f27c96d05f7fe847ffb6 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -26,7 +26,7 @@
 #include "config-host.h"
 #include "qemu-common.h"
 #include "trace.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "block/block.h"
 #include "block/blockjob.h"
 #include "block/block_int.h"

diff --git a/cpus.c b/cpus.c
index 8926873ad1b7af668f8c175213fa6c0960068532..3a66401e0dcf4e5057bf1b18910274cb0e9d00de 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -25,7 +25,7 @@
 /* Needed early for CONFIG_BSD etc. */
 #include "config-host.h"
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"
 #include "dma.h"

diff --git a/disas.c b/disas.c
index 8157b96fc1fb6a9e3aa92be2c78ef6397e5e268a..a46faeed80370e93a749539d44b33c705e66123d 100644 (file)
--- a/disas.c
+++ b/disas.c
@@ -374,7 +374,7 @@ const char *lookup_symbol(target_ulong orig_addr)
 
 #if !defined(CONFIG_USER_ONLY)
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 static int monitor_disas_is_physical;
 

diff --git a/dump.c b/dump.c
index e70e0f3b21500b9635aa66546b5dca39dc8487b5..871ee1727ab08242ff75b97e32461b783b67a726 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -16,7 +16,7 @@
 #include "cpu.h"
 #include "exec/cpu-all.h"
 #include "exec/hwaddr.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "kvm.h"
 #include "dump.h"
 #include "sysemu.h"

diff --git a/gdbstub.c b/gdbstub.c
index 70ad79a748f11dd949e7315a9db7a7234be5630e..9395c829a203a9e6a9680f7ff654958e51bd2715 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -29,7 +29,7 @@
 
 #include "qemu.h"
 #else
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-char.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"

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

diff --git a/hw/acpi.c b/hw/acpi.c
index ae29a59077387460b64b8ed25454fb807b44a3e7..fe9b76a9b01cc32da0cb9f985f11b407be83c4e4 100644 (file)
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -22,7 +22,7 @@
 #include "hw.h"
 #include "pc.h"
 #include "acpi.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 struct acpi_table_header {
     uint16_t _length;         /* our length, not actual part of the hdr */

diff --git a/hw/ccid-card-emulated.c b/hw/ccid-card-emulated.c
index f4a6da4283a3a27eaff154be7ad6ca75dee900d5..845a764446e2c38dfb0c327d0771f5d1c70211bd 100644 (file)
--- a/hw/ccid-card-emulated.c
+++ b/hw/ccid-card-emulated.c
@@ -33,7 +33,7 @@
 
 #include "qemu-thread.h"
 #include "qemu-char.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/ccid.h"
 
 #define DPRINTF(card, lvl, fmt, ...) \

diff --git a/hw/ccid-card-passthru.c b/hw/ccid-card-passthru.c
index bd6c77777da4207e109ff9ff0802b25987ce61d6..f5b4794e90786ceaad5ed87123320e86821962b2 100644 (file)
--- a/hw/ccid-card-passthru.c
+++ b/hw/ccid-card-passthru.c
@@ -10,7 +10,7 @@
 
 #include "qemu-char.h"
 #include "qemu_socket.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/ccid.h"
 #include "libcacard/vscard_common.h"
 

diff --git a/hw/device-hotplug.c b/hw/device-hotplug.c
index 336ffc2274b88cab5fbdb1c667e56ace409170cc..809a598e3aa78d7d01c2d410ddaec1c36e1f9e10 100644 (file)
--- a/hw/device-hotplug.c
+++ b/hw/device-hotplug.c
@@ -27,7 +27,7 @@
 #include "blockdev.h"
 #include "qemu-config.h"
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 DriveInfo *add_init_drive(const char *optstr)
 {

diff --git a/hw/i8259.c b/hw/i8259.c
index af0ba4d7c62d46e53a360dd35cd41b941ed0c16c..5e935e7f99957460ecece56a27cd05e18c7ed542 100644 (file)
--- a/hw/i8259.c
+++ b/hw/i8259.c
@@ -24,7 +24,7 @@
 #include "hw.h"
 #include "pc.h"
 #include "isa.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-timer.h"
 #include "i8259_internal.h"
 

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index f32a84761d8a275fc4b1fa23f805c9f065413f2c..d38c6e4574864191d8468a363c832227663847d6 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -27,7 +27,7 @@
 #include <hw/pci/pci.h>
 #include <hw/sysbus.h>
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "dma.h"
 #include "exec/cpu-common.h"
 #include "internal.h"

diff --git a/hw/isa-bus.c b/hw/isa-bus.c
index 8f409741667d3cda9a1e5202ba4d0afe13caed41..a2be67df562e8614d4b50105f9476160577aec92 100644 (file)
--- a/hw/isa-bus.c
+++ b/hw/isa-bus.c
@@ -17,7 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "hw.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysbus.h"
 #include "sysemu.h"
 #include "isa.h"

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

diff --git a/hw/lm32_pic.c b/hw/lm32_pic.c
index 32f65db7f13ad868a48311e7afef6103b6933cc2..42d5602cf07424b40f417bcde453f2c7e9f82aaf 100644 (file)
--- a/hw/lm32_pic.c
+++ b/hw/lm32_pic.c
@@ -21,7 +21,7 @@
 
 #include "hw.h"
 #include "pc.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysbus.h"
 #include "trace.h"
 #include "lm32_pic.h"

diff --git a/hw/loader.c b/hw/loader.c
index 03f0318d9141524387170bcdc5a26c8f05b0979e..f5ef575b52b7b64542c7cbfd6ade537488d349c2 100644 (file)
--- a/hw/loader.c
+++ b/hw/loader.c
@@ -44,7 +44,7 @@
 
 #include "hw.h"
 #include "disas/disas.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "uboot_image.h"
 #include "loader.h"

diff --git a/hw/pc.c b/hw/pc.c
index 2452fd42147f79dd3aad37e326dfe3cf96e40e02..7aaff0f2fd5805637326bffabf559466c475687c 100644 (file)
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -28,7 +28,7 @@
 #include "fdc.h"
 #include "ide.h"
 #include "pci/pci.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "fw_cfg.h"
 #include "hpet_emul.h"
 #include "smbios.h"

diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug.c
index 5ba7558ecd59fe3a9cf1499c9842d51338730c5b..e5e8a7ab58dc7b4cb879a51ee551d83290177de0 100644 (file)
--- a/hw/pci/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
@@ -27,7 +27,7 @@
 #include "hw/pci/pci.h"
 #include "net/net.h"
 #include "hw/pc.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/scsi.h"
 #include "hw/virtio-blk.h"
 #include "qemu-config.h"

diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index b5c43a935b2f4ca9e58c42a4454fda89b93180f2..5891dc959d69910f81aa0382ca2193650ee0f9ef 100644 (file)
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -19,7 +19,7 @@
  */
 
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/pci/pci.h"
 #include "qmp-commands.h"
 

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index fa0f08eb0aa7fcedd6f42e9965802ea128a6fde4..e062f6608814ecfb98ba384060a60f4d1311d47d 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -25,7 +25,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_bus.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "net/net.h"
 #include "sysemu.h"
 #include "hw/loader.h"

diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
index b6f4f8510f561d05d83d9c9a09d0301a4e2fce24..f7f3633f5b3296d3c8b5f29a592bde077d5f6380 100644 (file)
--- a/hw/pci/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
@@ -20,7 +20,7 @@
 
 #include "sysemu.h"
 #include "qapi/qmp/types.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pcie.h"
 #include "hw/pci/msix.h"

diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c
index 5aaf74b98af7b387aba58e99952eb7262fbc110f..207282c4a42157bb91a2eaf1316b5fe038b1cce3 100644 (file)
--- a/hw/qdev-monitor.c
+++ b/hw/qdev-monitor.c
@@ -18,7 +18,7 @@
  */
 
 #include "qdev.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qmp-commands.h"
 #include "arch_init.h"
 #include "qemu-config.h"

diff --git a/hw/qdev-monitor.h b/hw/qdev-monitor.h
index 220ceba4c548bd73aa54872afe95c37516c3022b..fae1b1ec8459b3c938037cfd9d5ef2f1af437c11 100644 (file)
--- a/hw/qdev-monitor.h
+++ b/hw/qdev-monitor.h
@@ -2,7 +2,7 @@
 #define QEMU_QDEV_MONITOR_H
 
 #include "qdev-core.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 /*** monitor commands ***/
 

diff --git a/hw/qxl.c b/hw/qxl.c
index 96887c4aadf2ebf11f36cf6f9eb9781c0ee7df51..ad0214827ee408230332c8cf52d437ccb9a14628 100644 (file)
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -23,7 +23,7 @@
 #include "qemu-common.h"
 #include "qemu-timer.h"
 #include "qemu-queue.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "trace.h"
 

diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index f7e19392881eaf3d91944c7afcdc250ae3866302..769015c13698fa6025da1a01bd648a39e12d86dd 100644 (file)
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -21,7 +21,7 @@
 #include "block/block.h"
 #include "sysemu.h"
 #include "boards.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "loader.h"
 #include "elf.h"
 #include "hw/virtio.h"

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 0a15625b73f36ae902a731d504e0d011e6145401..7dfe87ade36fdf1d8219d08cfea7b65b8f60f1cc 100644 (file)
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -23,7 +23,7 @@
 #include "sysemu.h"
 #include "net/net.h"
 #include "boards.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "loader.h"
 #include "elf.h"
 #include "hw/virtio.h"

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index bc9cea9e1b90390bfb21fea03235819d8c711c2b..748118d0f0afcd86c3fccf7df7d5acd0fdf48736 100644 (file)
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -15,7 +15,7 @@
  *
  */
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 
 #include "sclp.h"

diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c
index 6aafa8b233183a2984b59e88f96814b8674096f8..a44ce95c1f7a36dd30c0e801e9cdb01cae886840 100644 (file)
--- a/hw/slavio_intctl.c
+++ b/hw/slavio_intctl.c
@@ -23,7 +23,7 @@
  */
 
 #include "sun4m.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysbus.h"
 #include "trace.h"
 

diff --git a/hw/spapr_vio.c b/hw/spapr_vio.c
index 1f19fedd0e3055aec20a0770885f370ce1e4d459..fdf8db915816097e5e449b5dcc75d66de522c4ae 100644 (file)
--- a/hw/spapr_vio.c
+++ b/hw/spapr_vio.c
@@ -22,7 +22,7 @@
 #include "hw.h"
 #include "sysemu.h"
 #include "boards.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "loader.h"
 #include "elf.h"
 #include "hw/sysbus.h"

diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c
index 702e9f54448ec606427d5318dde43b04351bd01e..b78d54f232f1ab3dd3accd3e6fe1148b0681961d 100644 (file)
--- a/hw/sun4c_intctl.c
+++ b/hw/sun4c_intctl.c
@@ -24,7 +24,7 @@
 
 #include "hw.h"
 #include "sun4m.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysbus.h"
 
 //#define DEBUG_IRQ_COUNT

diff --git a/hw/sysbus.c b/hw/sysbus.c
index 7ab250463cbfe6707f8aa4b3a5eef76c1b54ac9b..49a41775f8ad7e2adab05a59a97011a24dec99c0 100644 (file)
--- a/hw/sysbus.c
+++ b/hw/sysbus.c
@@ -18,7 +18,7 @@
  */
 
 #include "sysbus.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "exec/address-spaces.h"
 
 static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 8264c240ee6cfd4b3de7eb97b17ae4575ecfdbb9..74728c94e5984006f1aad629d824726c72bf3cc0 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -2,7 +2,7 @@
 #include "hw/usb.h"
 #include "hw/qdev.h"
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "trace.h"
 
 static void usb_bus_dev_print(Monitor *mon, DeviceState *qdev, int indent);

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index de955b709f73442f275d6089b490b4951fdbd7ef..3862c9b6c976ac46e59b29dadd8e7bcfa66f8825 100644 (file)
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -38,7 +38,7 @@
 #include "qemu-error.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #include "hw/ccid.h"
 

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

diff --git a/hw/usb/hcd-ehci.h b/hw/usb/hcd-ehci.h
index 837c63be857176369e7f2e29b7d94ee558ecd12c..740f7309fb5ea1bdf549cf162968cd1fd6c8fc43 100644 (file)
--- a/hw/usb/hcd-ehci.h
+++ b/hw/usb/hcd-ehci.h
@@ -20,7 +20,7 @@
 #include "hw/hw.h"
 #include "qemu-timer.h"
 #include "hw/usb.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "trace.h"
 #include "dma.h"
 #include "sysemu.h"

diff --git a/hw/usb/host-bsd.c b/hw/usb/host-bsd.c
index dae000937881a13e91fb9b394d3572e521c570f6..340c21aeb493c52c6500f555868b3e568d7fe052 100644 (file)
--- a/hw/usb/host-bsd.c
+++ b/hw/usb/host-bsd.c
@@ -25,7 +25,7 @@
  */
 
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/usb.h"
 
 /* usb.h declares these */

diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c
index bdafb6bc87a9cd88218dcdba645c6d1a762c2326..5a56e99891b925fdeaca2cd63ac647df0fb73110 100644 (file)
--- a/hw/usb/host-linux.c
+++ b/hw/usb/host-linux.c
@@ -32,7 +32,7 @@
 
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "trace.h"
 

diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c
index e8da3221f6fe0a98e2d26a8e075424db78a00f17..58423a0f5cca9e9da4ed186b54244228c272432d 100644 (file)
--- a/hw/usb/host-stub.c
+++ b/hw/usb/host-stub.c
@@ -33,7 +33,7 @@
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "hw/usb.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 void usb_host_info(Monitor *mon)
 {

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 9e7f6453f7dba602bcc3fdc73cfa3bd8fe3c1da6..36210760200d5ed5757caf31f473fe1ba8acdee1 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -27,7 +27,7 @@
 
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "iov.h"
 

diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
index 155da58dcd7cc1769a7606912d1adb46c89a57be..5559518a930755a092d20fc0aa24d601a07638d1 100644 (file)
--- a/hw/virtio-serial-bus.c
+++ b/hw/virtio-serial-bus.c
@@ -19,7 +19,7 @@
  */
 
 #include "iov.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-queue.h"
 #include "sysbus.h"
 #include "trace.h"

diff --git a/hw/watchdog.c b/hw/watchdog.c
index f878bec860db88a2e15e72bebd23299dd0c2dc56..623b299f71e5dbb083ca22faae51e81c110ce027 100644 (file)
--- a/hw/watchdog.c
+++ b/hw/watchdog.c
@@ -24,7 +24,7 @@
 #include "qemu-config.h"
 #include "qemu-queue.h"
 #include "qapi/qmp/types.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "hw/watchdog.h"
 

diff --git a/include/block/block_int.h b/include/block/block_int.h
index d06de2637bd04edc895d25b67bb7d6cfa75deee9..14c57afd54e7e0bae04aa3b06edeff5015f2fc85 100644 (file)
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -31,7 +31,7 @@
 #include "qemu-timer.h"
 #include "qapi-types.h"
 #include "qapi/qmp/qerror.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #define BLOCK_FLAG_ENCRYPT          1
 #define BLOCK_FLAG_COMPAT6          4

diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
new file mode 100644 (file)
index 0000000..87fb49c
--- /dev/null
+++ b/include/monitor/monitor.h
@@ -0,0 +1,101 @@
+#ifndef MONITOR_H
+#define MONITOR_H
+
+#include "qemu-common.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qdict.h"
+#include "block/block.h"
+#include "monitor/readline.h"
+
+extern Monitor *cur_mon;
+extern Monitor *default_mon;
+
+/* flags for monitor_init */
+#define MONITOR_IS_DEFAULT    0x01
+#define MONITOR_USE_READLINE  0x02
+#define MONITOR_USE_CONTROL   0x04
+#define MONITOR_USE_PRETTY    0x08
+
+/* flags for monitor commands */
+#define MONITOR_CMD_ASYNC       0x0001
+
+/* QMP events */
+typedef enum MonitorEvent {
+    QEVENT_SHUTDOWN,
+    QEVENT_RESET,
+    QEVENT_POWERDOWN,
+    QEVENT_STOP,
+    QEVENT_RESUME,
+    QEVENT_VNC_CONNECTED,
+    QEVENT_VNC_INITIALIZED,
+    QEVENT_VNC_DISCONNECTED,
+    QEVENT_BLOCK_IO_ERROR,
+    QEVENT_RTC_CHANGE,
+    QEVENT_WATCHDOG,
+    QEVENT_SPICE_CONNECTED,
+    QEVENT_SPICE_INITIALIZED,
+    QEVENT_SPICE_DISCONNECTED,
+    QEVENT_BLOCK_JOB_COMPLETED,
+    QEVENT_BLOCK_JOB_CANCELLED,
+    QEVENT_BLOCK_JOB_ERROR,
+    QEVENT_BLOCK_JOB_READY,
+    QEVENT_DEVICE_TRAY_MOVED,
+    QEVENT_SUSPEND,
+    QEVENT_SUSPEND_DISK,
+    QEVENT_WAKEUP,
+    QEVENT_BALLOON_CHANGE,
+    QEVENT_SPICE_MIGRATE_COMPLETED,
+
+    /* Add to 'monitor_event_names' array in monitor.c when
+     * defining new events here */
+
+    QEVENT_MAX,
+} MonitorEvent;
+
+int monitor_cur_is_qmp(void);
+
+void monitor_protocol_event(MonitorEvent event, QObject *data);
+void monitor_init(CharDriverState *chr, int flags);
+
+int monitor_suspend(Monitor *mon);
+void monitor_resume(Monitor *mon);
+
+int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
+                                BlockDriverCompletionFunc *completion_cb,
+                                void *opaque);
+int monitor_read_block_device_key(Monitor *mon, const char *device,
+                                  BlockDriverCompletionFunc *completion_cb,
+                                  void *opaque);
+
+int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
+int monitor_handle_fd_param(Monitor *mon, const char *fdname);
+
+void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
+    GCC_FMT_ATTR(2, 0);
+void monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
+void monitor_print_filename(Monitor *mon, const char *filename);
+void monitor_flush(Monitor *mon);
+int monitor_set_cpu(int cpu_index);
+int monitor_get_cpu_index(void);
+
+typedef void (MonitorCompletion)(void *opaque, QObject *ret_data);
+
+void monitor_set_error(Monitor *mon, QError *qerror);
+void monitor_read_command(Monitor *mon, int show_prompt);
+ReadLineState *monitor_get_rs(Monitor *mon);
+int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
+                          void *opaque);
+
+int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret);
+
+int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret);
+
+AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,
+                                bool has_opaque, const char *opaque,
+                                Error **errp);
+int monitor_fdset_get_fd(int64_t fdset_id, int flags);
+int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd);
+int monitor_fdset_dup_fd_remove(int dup_fd);
+int monitor_fdset_dup_fd_find(int dup_fd);
+
+#endif /* !MONITOR_H */

diff --git a/include/monitor/readline.h b/include/monitor/readline.h
new file mode 100644 (file)
index 0000000..fc9806e
--- /dev/null
+++ b/include/monitor/readline.h
@@ -0,0 +1,55 @@
+#ifndef READLINE_H
+#define READLINE_H
+
+#include "qemu-common.h"
+
+#define READLINE_CMD_BUF_SIZE 4095
+#define READLINE_MAX_CMDS 64
+#define READLINE_MAX_COMPLETIONS 256
+
+typedef void ReadLineFunc(Monitor *mon, const char *str, void *opaque);
+typedef void ReadLineCompletionFunc(const char *cmdline);
+
+typedef struct ReadLineState {
+    char cmd_buf[READLINE_CMD_BUF_SIZE + 1];
+    int cmd_buf_index;
+    int cmd_buf_size;
+
+    char last_cmd_buf[READLINE_CMD_BUF_SIZE + 1];
+    int last_cmd_buf_index;
+    int last_cmd_buf_size;
+
+    int esc_state;
+    int esc_param;
+
+    char *history[READLINE_MAX_CMDS];
+    int hist_entry;
+
+    ReadLineCompletionFunc *completion_finder;
+    char *completions[READLINE_MAX_COMPLETIONS];
+    int nb_completions;
+    int completion_index;
+
+    ReadLineFunc *readline_func;
+    void *readline_opaque;
+    int read_password;
+    char prompt[256];
+    Monitor *mon;
+} ReadLineState;
+
+void readline_add_completion(ReadLineState *rs, const char *str);
+void readline_set_completion_index(ReadLineState *rs, int completion_index);
+
+const char *readline_get_history(ReadLineState *rs, unsigned int index);
+
+void readline_handle_byte(ReadLineState *rs, int ch);
+
+void readline_start(ReadLineState *rs, const char *prompt, int read_password,
+                    ReadLineFunc *readline_func, void *opaque);
+void readline_restart(ReadLineState *rs);
+void readline_show_prompt(ReadLineState *rs);
+
+ReadLineState *readline_init(Monitor *mon,
+                             ReadLineCompletionFunc *completion_finder);
+
+#endif /* !READLINE_H */

diff --git a/include/ui/console.h b/include/ui/console.h
index eff5cc92d637723db8b78e62e4130a875f79af2d..3db6635b0a674f41f94483d2921fd846d7ac227d 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -4,7 +4,7 @@
 #include "ui/qemu-pixman.h"
 #include "qapi/qmp/qdict.h"
 #include "notify.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "trace.h"
 #include "qapi-types.h"
 #include "qapi/error.h"

diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 5857b8a92e660d57aa4d7601fcf13460faa52e51..3e08be06bf083234b4c5c1bfe2ca0ae1496f96b4 100644 (file)
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -24,7 +24,7 @@
 
 #include "qemu-option.h"
 #include "qemu-config.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 extern int using_spice;
 
@@ -47,7 +47,7 @@ void do_info_spice(Monitor *mon, QObject **ret_data);
 CharDriverState *qemu_chr_open_spice(QemuOpts *opts);
 
 #else  /* CONFIG_SPICE */
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #define using_spice 0
 static inline int qemu_spice_set_passwd(const char *passwd,

diff --git a/migration-fd.c b/migration-fd.c
index e86228823fead18d3391e3823f967eaa57aa7322..73a1dfcc937a092041d3c6b0a93b633d7f68dd9a 100644 (file)
--- a/migration-fd.c
+++ b/migration-fd.c
@@ -16,7 +16,7 @@
 #include "qemu-common.h"
 #include "qemu_socket.h"
 #include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "buffered_file.h"
 #include "block/block.h"
 #include "qemu_socket.h"

diff --git a/migration.c b/migration.c
index 1fce152548b0c17118a3fb4c1acca679969f6772..27a272eace3a13e1cceb053a3ba0e9b9c0fc0813 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -15,7 +15,7 @@
 
 #include "qemu-common.h"
 #include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "buffered_file.h"
 #include "sysemu.h"
 #include "block/block.h"

diff --git a/monitor.c b/monitor.c
index a3e010968e44223a1971901ae3b496d343ff7e72..94c6bb6672db0c55f0e9bea56b579b485057747c 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -36,8 +36,8 @@
 #include "qemu-char.h"
 #include "ui/qemu-spice.h"
 #include "sysemu.h"
-#include "monitor.h"
-#include "readline.h"
+#include "monitor/monitor.h"
+#include "monitor/readline.h"
 #include "ui/console.h"
 #include "blockdev.h"
 #include "audio/audio.h"

diff --git a/monitor.h b/monitor.h
deleted file mode 100644 (file)
index 9e96e83..0000000
--- a/monitor.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef MONITOR_H
-#define MONITOR_H
-
-#include "qemu-common.h"
-#include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qdict.h"
-#include "block/block.h"
-#include "readline.h"
-
-extern Monitor *cur_mon;
-extern Monitor *default_mon;
-
-/* flags for monitor_init */
-#define MONITOR_IS_DEFAULT    0x01
-#define MONITOR_USE_READLINE  0x02
-#define MONITOR_USE_CONTROL   0x04
-#define MONITOR_USE_PRETTY    0x08
-
-/* flags for monitor commands */
-#define MONITOR_CMD_ASYNC       0x0001
-
-/* QMP events */
-typedef enum MonitorEvent {
-    QEVENT_SHUTDOWN,
-    QEVENT_RESET,
-    QEVENT_POWERDOWN,
-    QEVENT_STOP,
-    QEVENT_RESUME,
-    QEVENT_VNC_CONNECTED,
-    QEVENT_VNC_INITIALIZED,
-    QEVENT_VNC_DISCONNECTED,
-    QEVENT_BLOCK_IO_ERROR,
-    QEVENT_RTC_CHANGE,
-    QEVENT_WATCHDOG,
-    QEVENT_SPICE_CONNECTED,
-    QEVENT_SPICE_INITIALIZED,
-    QEVENT_SPICE_DISCONNECTED,
-    QEVENT_BLOCK_JOB_COMPLETED,
-    QEVENT_BLOCK_JOB_CANCELLED,
-    QEVENT_BLOCK_JOB_ERROR,
-    QEVENT_BLOCK_JOB_READY,
-    QEVENT_DEVICE_TRAY_MOVED,
-    QEVENT_SUSPEND,
-    QEVENT_SUSPEND_DISK,
-    QEVENT_WAKEUP,
-    QEVENT_BALLOON_CHANGE,
-    QEVENT_SPICE_MIGRATE_COMPLETED,
-
-    /* Add to 'monitor_event_names' array in monitor.c when
-     * defining new events here */
-
-    QEVENT_MAX,
-} MonitorEvent;
-
-int monitor_cur_is_qmp(void);
-
-void monitor_protocol_event(MonitorEvent event, QObject *data);
-void monitor_init(CharDriverState *chr, int flags);
-
-int monitor_suspend(Monitor *mon);
-void monitor_resume(Monitor *mon);
-
-int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
-                                BlockDriverCompletionFunc *completion_cb,
-                                void *opaque);
-int monitor_read_block_device_key(Monitor *mon, const char *device,
-                                  BlockDriverCompletionFunc *completion_cb,
-                                  void *opaque);
-
-int monitor_get_fd(Monitor *mon, const char *fdname, Error **errp);
-int monitor_handle_fd_param(Monitor *mon, const char *fdname);
-
-void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
-    GCC_FMT_ATTR(2, 0);
-void monitor_printf(Monitor *mon, const char *fmt, ...) GCC_FMT_ATTR(2, 3);
-void monitor_print_filename(Monitor *mon, const char *filename);
-void monitor_flush(Monitor *mon);
-int monitor_set_cpu(int cpu_index);
-int monitor_get_cpu_index(void);
-
-typedef void (MonitorCompletion)(void *opaque, QObject *ret_data);
-
-void monitor_set_error(Monitor *mon, QError *qerror);
-void monitor_read_command(Monitor *mon, int show_prompt);
-ReadLineState *monitor_get_rs(Monitor *mon);
-int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
-                          void *opaque);
-
-int qmp_qom_set(Monitor *mon, const QDict *qdict, QObject **ret);
-
-int qmp_qom_get(Monitor *mon, const QDict *qdict, QObject **ret);
-
-AddfdInfo *monitor_fdset_add_fd(int fd, bool has_fdset_id, int64_t fdset_id,
-                                bool has_opaque, const char *opaque,
-                                Error **errp);
-int monitor_fdset_get_fd(int64_t fdset_id, int flags);
-int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd);
-int monitor_fdset_dup_fd_remove(int dup_fd);
-int monitor_fdset_dup_fd_find(int dup_fd);
-
-#endif /* !MONITOR_H */

diff --git a/net/hub.c b/net/hub.c
index 8508ecf380880f890c9e265d8315568d65c951d4..81a73b54a72e7db960ba05f3b04f07d709c73079 100644 (file)
--- a/net/hub.c
+++ b/net/hub.c
@@ -12,7 +12,7 @@
  *
  */
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "net/net.h"
 #include "clients.h"
 #include "hub.h"

diff --git a/net/net.c b/net/net.c
index ead7e96fe1ebd0cc768682d60b5c341c4368de3e..e4d85a9cfae015cfe99acd8ab8912ed17aced742 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -29,7 +29,7 @@
 #include "net/slirp.h"
 #include "util.h"
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-common.h"
 #include "qemu_socket.h"
 #include "qemu-config.h"

diff --git a/net/slirp.c b/net/slirp.c
index 5a11ac5859322926eb7d0c603fecadd801ea8478..c37a5ef959fdaca6f5846961d86263f065712efd 100644 (file)
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -32,7 +32,7 @@
 #include "net/net.h"
 #include "clients.h"
 #include "hub.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu_socket.h"
 #include "slirp/libslirp.h"
 #include "qemu-char.h"

diff --git a/net/socket.c b/net/socket.c
index 8430f1a161985620926649f47efc7fa2850a1b67..bc2b95183286aea8439c29d1e4fed5918cad14ce 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -25,7 +25,7 @@
 
 #include "net/net.h"
 #include "clients.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-common.h"
 #include "qemu-error.h"
 #include "qemu-option.h"

diff --git a/net/tap.c b/net/tap.c
index f8cabc4f86d8be5e36b9fcaeeabd5a51564ee4b7..9a677e9864d05949765faf5e32d404cb64f1d82d 100644 (file)
--- a/net/tap.c
+++ b/net/tap.c
@@ -35,7 +35,7 @@
 
 #include "net/net.h"
 #include "clients.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "qemu-common.h"
 #include "qemu-error.h"

diff --git a/osdep.c b/osdep.c
index 3a63d26e75c0556a0d9e718a6c3281b904f61447..807e90cf973f630235d5c462d33e4e81cff08bb8 100644 (file)
--- a/osdep.c
+++ b/osdep.c
@@ -48,7 +48,7 @@ extern int madvise(caddr_t, size_t, int);
 #include "qemu-common.h"
 #include "trace.h"
 #include "qemu_socket.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 static bool fips_enabled = false;
 

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

diff --git a/qemu-error.c b/qemu-error.c
index 7cd5ffe1e9a4c8a372a26905153307589f8f7004..08a36f480c841cc2223b6185da02fd96385fed11 100644 (file)
--- a/qemu-error.c
+++ b/qemu-error.c
@@ -11,7 +11,7 @@
  */
 
 #include <stdio.h>
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 /*
  * Print to current monitor if we have one, else to stderr.

diff --git a/qemu-sockets.c b/qemu-sockets.c
index c52a40a41147ad53f90c5f50abc5ed13a27271c9..cea0a4b8ac9bc16a53da92428a454e1b0e27f914 100644 (file)
--- a/qemu-sockets.c
+++ b/qemu-sockets.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu_socket.h"
 #include "qemu-common.h" /* for qemu_isdigit */
 #include "main-loop.h"

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

diff --git a/qemu-tool.c b/qemu-tool.c
index b46631e4227af0351adec88d46b6f384efa1fff5..40453fdd991c907fc7258f5c5facc8813f2205f0 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-timer.h"
 #include "qemu-log.h"
 #include "migration.h"

diff --git a/qemu-user.c b/qemu-user.c
index 08ccb0fe8e0b5dd44d6ea6ab7e64890bea74fdaf..f8b450c03d6c358fe9a8423cc890a03af0d81d16 100644 (file)
--- a/qemu-user.c
+++ b/qemu-user.c
@@ -19,7 +19,7 @@
  */
 
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 Monitor *cur_mon;
 

diff --git a/qerror.c b/qerror.c
index 8c781042779aedcb571c97cdb71ac8a0c0f2749c..3aee1cf6a693965fdc63f38cc1d8da775f501dd9 100644 (file)
--- a/qerror.c
+++ b/qerror.c
@@ -10,7 +10,7 @@
  * 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/qerror.h"
 #include "qemu-common.h"

diff --git a/readline.c b/readline.c
index 540cd8a025d145dd3fe28e538bd79f9198e9c5fc..5fc9643c2bf23a22822594e92ae5c19e7faef6df 100644 (file)
--- a/readline.c
+++ b/readline.c
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "readline.h"
-#include "monitor.h"
+#include "monitor/readline.h"
+#include "monitor/monitor.h"
 
 #define IS_NORM 0
 #define IS_ESC  1

diff --git a/readline.h b/readline.h
deleted file mode 100644 (file)
index fc9806e..0000000
--- a/readline.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef READLINE_H
-#define READLINE_H
-
-#include "qemu-common.h"
-
-#define READLINE_CMD_BUF_SIZE 4095
-#define READLINE_MAX_CMDS 64
-#define READLINE_MAX_COMPLETIONS 256
-
-typedef void ReadLineFunc(Monitor *mon, const char *str, void *opaque);
-typedef void ReadLineCompletionFunc(const char *cmdline);
-
-typedef struct ReadLineState {
-    char cmd_buf[READLINE_CMD_BUF_SIZE + 1];
-    int cmd_buf_index;
-    int cmd_buf_size;
-
-    char last_cmd_buf[READLINE_CMD_BUF_SIZE + 1];
-    int last_cmd_buf_index;
-    int last_cmd_buf_size;
-
-    int esc_state;
-    int esc_param;
-
-    char *history[READLINE_MAX_CMDS];
-    int hist_entry;
-
-    ReadLineCompletionFunc *completion_finder;
-    char *completions[READLINE_MAX_COMPLETIONS];
-    int nb_completions;
-    int completion_index;
-
-    ReadLineFunc *readline_func;
-    void *readline_opaque;
-    int read_password;
-    char prompt[256];
-    Monitor *mon;
-} ReadLineState;
-
-void readline_add_completion(ReadLineState *rs, const char *str);
-void readline_set_completion_index(ReadLineState *rs, int completion_index);
-
-const char *readline_get_history(ReadLineState *rs, unsigned int index);
-
-void readline_handle_byte(ReadLineState *rs, int ch);
-
-void readline_start(ReadLineState *rs, const char *prompt, int read_password,
-                    ReadLineFunc *readline_func, void *opaque);
-void readline_restart(ReadLineState *rs);
-void readline_show_prompt(ReadLineState *rs);
-
-ReadLineState *readline_init(Monitor *mon,
-                             ReadLineCompletionFunc *completion_finder);
-
-#endif /* !READLINE_H */

diff --git a/savevm.c b/savevm.c
index cb33501ecc482e7e2d6fc778e542ef3f02d9f2f8..bf341bb25f41236be1cb0a2457b6780f17fec9a4 100644 (file)
--- a/savevm.c
+++ b/savevm.c
@@ -73,7 +73,7 @@
 #include "hw/hw.h"
 #include "hw/qdev.h"
 #include "net/net.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "sysemu.h"
 #include "qemu-timer.h"
 #include "audio/audio.h"

diff --git a/slirp/misc.c b/slirp/misc.c
index 664532a663f363f533529ffe9b52d725786cdbbc..d4df972d1332187d185f61908d03f0e18c5db723 100644 (file)
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -8,7 +8,7 @@
 #include <slirp.h>
 #include <libslirp.h>
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 #ifdef DEBUG
 int slirp_debug = DBG_CALL|DBG_MISC|DBG_ERROR;
@@ -242,7 +242,7 @@ strdup(str)
 }
 #endif
 
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 void lprint(const char *format, ...)
 {

diff --git a/stubs/fdset-add-fd.c b/stubs/fdset-add-fd.c
index 09fe2a839aa22ebb9d4fec1ea06669525846e515..ee1643708c294fa6f313a9876761af0671ca87e3 100644 (file)
--- a/stubs/fdset-add-fd.c
+++ b/stubs/fdset-add-fd.c
@@ -1,5 +1,5 @@
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
 {

diff --git a/stubs/fdset-find-fd.c b/stubs/fdset-find-fd.c
index f82baa066c831738ea2f8870bae53a124bb9714d..4f18344bad9eb66e15daf020454e8c54e53cbda4 100644 (file)
--- a/stubs/fdset-find-fd.c
+++ b/stubs/fdset-find-fd.c
@@ -1,5 +1,5 @@
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 int monitor_fdset_dup_fd_find(int dup_fd)
 {

diff --git a/stubs/fdset-get-fd.c b/stubs/fdset-get-fd.c
index 4106cf90f08b051c023c238c614b55f0e10d3772..7112c155e3921384602bf6b69c8cf3be361f688f 100644 (file)
--- a/stubs/fdset-get-fd.c
+++ b/stubs/fdset-get-fd.c
@@ -1,5 +1,5 @@
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 int monitor_fdset_get_fd(int64_t fdset_id, int flags)
 {

diff --git a/stubs/fdset-remove-fd.c b/stubs/fdset-remove-fd.c
index 861b31247e99aa8a5f2a9d9a33251d7cf5a31a10..b3886d9f45c30423ad4719ea27b97ea7bb976ff0 100644 (file)
--- a/stubs/fdset-remove-fd.c
+++ b/stubs/fdset-remove-fd.c
@@ -1,5 +1,5 @@
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 int monitor_fdset_dup_fd_remove(int dupfd)
 {

diff --git a/stubs/get-fd.c b/stubs/get-fd.c
index 3561ab60e27efbb2197a69ad6f445c434cf740aa..9f2c65cf0a523f0eef387e2a43f739d012106e66 100644 (file)
--- a/stubs/get-fd.c
+++ b/stubs/get-fd.c
@@ -1,5 +1,5 @@
 #include "qemu-common.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 
 int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
 {

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 00341c523363a4c0c90e35d717113b865dce60e3..bd47b8e58ee1f0b9d00ed1b56d08db402d5eb458 100644 (file)
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -21,7 +21,7 @@
 #include "kvm.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #endif
 
 //#define DEBUG_MMU

diff --git a/ui/input.c b/ui/input.c
index 65950af9af2749424ec8307c9d650ca8f4ca4141..05f6c0c849e300e9b1efe7f1f268884d6c430c9e 100644 (file)
--- a/ui/input.c
+++ b/ui/input.c
@@ -23,7 +23,7 @@
  */
 
 #include "sysemu.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "qapi/error.h"
 #include "qmp-commands.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 0550805b3855ba287d4d86ec323779ba5a727009..379677554e17f1336249b20717d00e104846b290 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -35,7 +35,7 @@
 #include "qapi/qmp/qjson.h"
 #include "notify.h"
 #include "migration.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "hw/hw.h"
 #include "ui/spice-display.h"
 

diff --git a/ui/spice-display.c b/ui/spice-display.c
index 681fe32fedee7896309227e3c8504103429f5be6..56ebf808054ff7b64be89d410f123a594c0cbea2 100644 (file)
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -19,7 +19,7 @@
 #include "ui/qemu-spice.h"
 #include "qemu-timer.h"
 #include "qemu-queue.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
 #include "trace.h"

diff --git a/ui/vnc.h b/ui/vnc.h
index 7ec183372a98e403d4433a727c135af0ddc4d1aa..e5c043ff458f98333a9e29e73c337113add9904d 100644 (file)
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -31,7 +31,7 @@
 #include "qemu-queue.h"
 #include "qemu-thread.h"
 #include "ui/console.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "audio/audio.h"
 #include "bitmap.h"
 #include <zlib.h>

diff --git a/vl.c b/vl.c
index 015f0a4757d15e50907c0c98c496a6c2179e45ac..9adaf28e64948819bdbcab8f04949c9fc78fd31a 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
 #include "bt-host.h"
 #include "net/net.h"
 #include "net/slirp.h"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "ui/console.h"
 #include "sysemu.h"
 #include "exec/gdbstub.h"