monitor: move include files to include/monitor/

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

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"

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"
 

audio/wavcapture.c

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

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"

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);

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"

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"

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"

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"

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"

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;
 

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"

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"

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)

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 */

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, ...) \

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"
 

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)
 {

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"
 

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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 ***/
 

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"
 

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"

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"

hw/s390x/event-facility.c

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

hw/slavio_intctl.c

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

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"

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

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);

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);

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"
 

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"
 

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"

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 */

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"
 

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)
 {

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"
 

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"

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"
 

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

monitor.h → include/monitor/monitor.h

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

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"

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,

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"

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"

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"

net/hub.c

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

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"

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"

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"

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"

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;
 

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"

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.

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"

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"

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"

qemu-user.c

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

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"

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

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"

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, ...)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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)
 {

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

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"

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"
 

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"

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>

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"