block: move include files to include/block/

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

aes.c

@@ -28,7 +28,7 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "qemu-common.h"
-#include "aes.h"
+#include "block/aes.h"
 
 #ifndef NDEBUG
 #define NDEBUG

aio-posix.c

@@ -14,7 +14,7 @@
  */
 
 #include "qemu-common.h"
-#include "block.h"
+#include "block/block.h"
 #include "qemu-queue.h"
 #include "qemu_socket.h"
 

aio-win32.c

@@ -16,7 +16,7 @@
  */
 
 #include "qemu-common.h"
-#include "block.h"
+#include "block/block.h"
 #include "qemu-queue.h"
 #include "qemu_socket.h"
 

async.c

@@ -23,7 +23,7 @@
  */
 
 #include "qemu-common.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "main-loop.h"
 
 /***********************************************************/

block-migration.c

@@ -14,7 +14,7 @@
  */
 
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "hw/hw.h"
 #include "qemu-queue.h"
 #include "qemu-timer.h"

block.c

@@ -25,13 +25,13 @@
 #include "qemu-common.h"
 #include "trace.h"
 #include "monitor.h"
-#include "block_int.h"
-#include "blockjob.h"
+#include "block/block_int.h"
+#include "block/blockjob.h"
 #include "module.h"
 #include "qapi/qmp/qjson.h"
 #include "sysemu.h"
 #include "notify.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "qmp-commands.h"
 #include "qemu-timer.h"
 

block/blkdebug.c

@@ -24,7 +24,7 @@
 
 #include "qemu-common.h"
 #include "qemu-config.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 
 typedef struct BDRVBlkdebugState {

block/blkverify.c

@@ -9,7 +9,7 @@
 
 #include <stdarg.h>
 #include "qemu_socket.h" /* for EINPROGRESS on Windows */
-#include "block_int.h"
+#include "block/block_int.h"
 
 typedef struct {
     BlockDriverState *test_file;

block/bochs.c

@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 
 /**************************************************************/

block/cloop.c

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include <zlib.h>
 

block/commit.c

@@ -13,8 +13,8 @@
  */
 
 #include "trace.h"
-#include "block_int.h"
-#include "blockjob.h"
+#include "block/block_int.h"
+#include "block/blockjob.h"
 #include "qemu/ratelimit.h"
 
 enum {

block/cow.c

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 
 /**************************************************************/

block/curl.c

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include <curl/curl.h>
 
 // #define DEBUG

block/dmg.c

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "bswap.h"
 #include "module.h"
 #include <zlib.h>

block/gluster.c

@@ -16,7 +16,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 #include <glusterfs/api/glfs.h>
-#include "block_int.h"
+#include "block/block_int.h"
 #include "qemu_socket.h"
 #include "uri.h"
 

block/iscsi.c

@@ -29,7 +29,7 @@
 #include "qemu-common.h"
 #include "qemu-config.h"
 #include "qemu-error.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "trace.h"
 #include "hw/scsi-defs.h"
 

block/linux-aio.c

@@ -8,7 +8,7 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu-common.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "qemu-queue.h"
 #include "block/raw-aio.h"
 #include "event_notifier.h"

block/mirror.c

@@ -12,8 +12,8 @@
  */
 
 #include "trace.h"
-#include "blockjob.h"
-#include "block_int.h"
+#include "block/blockjob.h"
+#include "block/block_int.h"
 #include "qemu/ratelimit.h"
 
 enum {

block/nbd.c

@@ -27,9 +27,9 @@
  */
 
 #include "qemu-common.h"
-#include "nbd.h"
+#include "block/nbd.h"
 #include "uri.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include "qemu_socket.h"
 

block/parallels.c

@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 
 /**************************************************************/

block/qcow.c

@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include <zlib.h>
-#include "aes.h"
+#include "block/aes.h"
 #include "migration.h"
 
 /**************************************************************/

block/qcow2-cache.c

@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "block_int.h"
+#include "block/block_int.h"
 #include "qemu-common.h"
 #include "qcow2.h"
 #include "trace.h"

block/qcow2-cluster.c

@@ -25,7 +25,7 @@
 #include <zlib.h>
 
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "block/qcow2.h"
 #include "trace.h"
 

block/qcow2-refcount.c

@@ -23,7 +23,7 @@
  */
 
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "block/qcow2.h"
 
 static int64_t alloc_clusters_noref(BlockDriverState *bs, int64_t size);

block/qcow2-snapshot.c

@@ -23,7 +23,7 @@
  */
 
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "block/qcow2.h"
 
 typedef struct QEMU_PACKED QCowSnapshotHeader {

block/qcow2.c

@@ -22,10 +22,10 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include <zlib.h>
-#include "aes.h"
+#include "block/aes.h"
 #include "block/qcow2.h"
 #include "qemu-error.h"
 #include "qapi/qmp/qerror.h"

block/qcow2.h

@@ -25,8 +25,8 @@
 #ifndef BLOCK_QCOW2_H
 #define BLOCK_QCOW2_H
 
-#include "aes.h"
-#include "qemu-coroutine.h"
+#include "block/aes.h"
+#include "block/coroutine.h"
 
 //#define DEBUG_ALLOC
 //#define DEBUG_ALLOC2

block/qed.h

@@ -15,7 +15,7 @@
 #ifndef BLOCK_QED_H
 #define BLOCK_QED_H
 
-#include "block_int.h"
+#include "block/block_int.h"
 
 /* The layout of a QED file is as follows:
  *

block/raw-posix.c

@@ -24,10 +24,10 @@
 #include "qemu-common.h"
 #include "qemu-timer.h"
 #include "qemu-log.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include "trace.h"
-#include "thread-pool.h"
+#include "block/thread-pool.h"
 #include "iov.h"
 #include "raw-aio.h"
 

block/raw-win32.c

@@ -23,11 +23,11 @@
  */
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include "raw-aio.h"
 #include "trace.h"
-#include "thread-pool.h"
+#include "block/thread-pool.h"
 #include "iov.h"
 #include <windows.h>
 #include <winioctl.h>

block/raw.c

@@ -1,6 +1,6 @@
 
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 
 static int raw_open(BlockDriverState *bs, int flags)

block/rbd.c

@@ -15,7 +15,7 @@
 
 #include "qemu-common.h"
 #include "qemu-error.h"
-#include "block_int.h"
+#include "block/block_int.h"
 
 #include <rbd/librbd.h>
 

block/sheepdog.c

@@ -15,7 +15,7 @@
 #include "qemu-common.h"
 #include "qemu-error.h"
 #include "qemu_socket.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "bitops.h"
 
 #define SD_PROTO_VER 0x01

block/stream.c

@@ -12,8 +12,8 @@
  */
 
 #include "trace.h"
-#include "block_int.h"
-#include "blockjob.h"
+#include "block/block_int.h"
+#include "block/blockjob.h"
 #include "qemu/ratelimit.h"
 
 enum {

block/vdi.c

@@ -50,7 +50,7 @@
  */
 
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include "migration.h"
 

block/vmdk.c

@@ -24,7 +24,7 @@
  */
 
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include "migration.h"
 #include <zlib.h>

block/vpc.c

@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include "migration.h"
 #if defined(CONFIG_UUID)

block/vvfat.c

@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 #include <dirent.h>
 #include "qemu-common.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include "migration.h"
 

block/win32-aio.c

@@ -23,10 +23,10 @@
  */
 #include "qemu-common.h"
 #include "qemu-timer.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "module.h"
 #include "qemu-common.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "raw-aio.h"
 #include "event_notifier.h"
 #include <windows.h>

blockdev-nbd.c

@@ -16,7 +16,7 @@
 #include "sysemu.h"
 #include "qmp-commands.h"
 #include "trace.h"
-#include "nbd.h"
+#include "block/nbd.h"
 #include "qemu_socket.h"
 
 static int server_fd = -1;

blockdev.c

@@ -9,14 +9,14 @@
 
 #include "blockdev.h"
 #include "hw/block-common.h"
-#include "blockjob.h"
+#include "block/blockjob.h"
 #include "monitor.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu-option.h"
 #include "qemu-config.h"
 #include "qapi/qmp/types.h"
 #include "sysemu.h"
-#include "block_int.h"
+#include "block/block_int.h"
 #include "qmp-commands.h"
 #include "trace.h"
 #include "arch_init.h"

blockdev.h

@@ -10,7 +10,7 @@
 #ifndef BLOCKDEV_H
 #define BLOCKDEV_H
 
-#include "block.h"
+#include "block/block.h"
 #include "qapi/error.h"
 #include "qemu-queue.h"
 

blockjob.c

@@ -27,11 +27,11 @@
 #include "qemu-common.h"
 #include "trace.h"
 #include "monitor.h"
-#include "block.h"
-#include "blockjob.h"
-#include "block_int.h"
+#include "block/block.h"
+#include "block/blockjob.h"
+#include "block/block_int.h"
 #include "qapi/qmp/qjson.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "qmp-commands.h"
 #include "qemu-timer.h"
 

cmd.c

@@ -24,7 +24,7 @@
 #include <getopt.h>
 
 #include "cmd.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "main-loop.h"
 
 #define _(x)	x	/* not gettext support yet */

coroutine-gthread.c

@@ -20,7 +20,7 @@
 
 #include <glib.h>
 #include "qemu-common.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine_int.h"
 
 typedef struct {
     Coroutine base;

coroutine-sigaltstack.c

@@ -31,7 +31,7 @@
 #include <pthread.h>
 #include <signal.h>
 #include "qemu-common.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine_int.h"
 
 enum {
     /* Maximum free pool size prevents holding too many freed coroutines */

coroutine-ucontext.c

@@ -28,7 +28,7 @@
 #include <pthread.h>
 #include <ucontext.h>
 #include "qemu-common.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine_int.h"
 
 #ifdef CONFIG_VALGRIND_H
 #include <valgrind/valgrind.h>

coroutine-win32.c

@@ -23,7 +23,7 @@
  */
 
 #include "qemu-common.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine_int.h"
 
 typedef struct
 {

dma.h

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include "memory.h"
 #include "hw/hw.h"
-#include "block.h"
+#include "block/block.h"
 #include "kvm.h"
 
 typedef struct DMAContext DMAContext;

hw/9pfs/codir.c

@@ -14,7 +14,7 @@
 
 #include "fsdev/qemu-fsdev.h"
 #include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "virtio-9p-coth.h"
 
 int v9fs_co_readdir_r(V9fsPDU *pdu, V9fsFidState *fidp, struct dirent *dent,

hw/9pfs/cofile.c

@@ -14,7 +14,7 @@
 
 #include "fsdev/qemu-fsdev.h"
 #include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "virtio-9p-coth.h"
 
 int v9fs_co_st_gen(V9fsPDU *pdu, V9fsPath *path, mode_t st_mode,

hw/9pfs/cofs.c

@@ -14,7 +14,7 @@
 
 #include "fsdev/qemu-fsdev.h"
 #include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "virtio-9p-coth.h"
 
 int v9fs_co_readlink(V9fsPDU *pdu, V9fsPath *path, V9fsString *buf)

hw/9pfs/coxattr.c

@@ -14,7 +14,7 @@
 
 #include "fsdev/qemu-fsdev.h"
 #include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "virtio-9p-coth.h"
 
 int v9fs_co_llistxattr(V9fsPDU *pdu, V9fsPath *path, void *value, size_t size)

hw/9pfs/virtio-9p-coth.c

@@ -14,7 +14,7 @@
 
 #include "fsdev/qemu-fsdev.h"
 #include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "virtio-9p-coth.h"
 
 /* v9fs glib thread pool */

hw/9pfs/virtio-9p-coth.h

@@ -16,7 +16,7 @@
 #define _QEMU_VIRTIO_9P_COTH_H
 
 #include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "virtio-9p.h"
 #include <glib.h>
 

hw/9pfs/virtio-9p.h

@@ -10,7 +10,7 @@
 #include "fsdev/file-op-9p.h"
 #include "fsdev/virtio-9p-marshal.h"
 #include "qemu-thread.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 
 
 /* The feature bitmap for virtio 9P */

hw/hd-geometry.c

@@ -30,7 +30,7 @@
  * THE SOFTWARE.
  */
 
-#include "block.h"
+#include "block/block.h"
 #include "hw/block-common.h"
 #include "trace.h"
 

hw/hw.h

@@ -10,7 +10,7 @@
 
 #include "ioport.h"
 #include "irq.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "qemu-file.h"
 #include "vmstate.h"
 #include "qemu-log.h"

hw/ide/cmd646.c

@@ -26,7 +26,7 @@
 #include <hw/pc.h>
 #include <hw/pci/pci.h>
 #include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
 #include "sysemu.h"
 #include "dma.h"
 

hw/ide/ich.c

@@ -65,7 +65,7 @@
 #include <hw/pc.h>
 #include <hw/pci/pci.h>
 #include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
 #include "dma.h"
 
 #include <hw/ide/pci.h>

hw/ide/isa.c

@@ -25,7 +25,7 @@
 #include <hw/hw.h>
 #include <hw/pc.h>
 #include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>

hw/ide/macio.c

@@ -25,7 +25,7 @@
 #include <hw/hw.h>
 #include <hw/ppc_mac.h>
 #include <hw/mac_dbdma.h>
-#include "block.h"
+#include "block/block.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>

hw/ide/microdrive.c

@@ -25,7 +25,7 @@
 #include <hw/hw.h>
 #include <hw/pc.h>
 #include <hw/pcmcia.h>
-#include "block.h"
+#include "block/block.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>

hw/ide/mmio.c

@@ -23,7 +23,7 @@
  * THE SOFTWARE.
  */
 #include <hw/hw.h>
-#include "block.h"
+#include "block/block.h"
 #include "dma.h"
 
 #include <hw/ide/internal.h>

hw/ide/pci.c

@@ -26,7 +26,7 @@
 #include <hw/pc.h>
 #include <hw/pci/pci.h>
 #include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
 #include "dma.h"
 
 #include <hw/ide/pci.h>

hw/ide/via.c

@@ -27,7 +27,7 @@
 #include <hw/pc.h>
 #include <hw/pci/pci.h>
 #include <hw/isa.h>
-#include "block.h"
+#include "block/block.h"
 #include "sysemu.h"
 #include "dma.h"
 

hw/mips_fulong2e.c

@@ -25,7 +25,7 @@
 #include "net/net.h"
 #include "boards.h"
 #include "smbus.h"
-#include "block.h"
+#include "block/block.h"
 #include "flash.h"
 #include "mips.h"
 #include "mips_cpudevs.h"

hw/mips_malta.c

@@ -29,7 +29,7 @@
 #include "net/net.h"
 #include "boards.h"
 #include "smbus.h"
-#include "block.h"
+#include "block/block.h"
 #include "flash.h"
 #include "mips.h"
 #include "mips_cpudevs.h"

hw/musicpal.c

@@ -18,7 +18,7 @@
 #include "serial.h"
 #include "qemu-timer.h"
 #include "ptimer.h"
-#include "block.h"
+#include "block/block.h"
 #include "flash.h"
 #include "ui/console.h"
 #include "i2c.h"

hw/pflash_cfi01.c

@@ -38,7 +38,7 @@
 
 #include "hw.h"
 #include "flash.h"
-#include "block.h"
+#include "block/block.h"
 #include "qemu-timer.h"
 #include "exec-memory.h"
 #include "host-utils.h"

hw/pflash_cfi02.c

@@ -38,7 +38,7 @@
 #include "hw.h"
 #include "flash.h"
 #include "qemu-timer.h"
-#include "block.h"
+#include "block/block.h"
 #include "exec-memory.h"
 #include "host-utils.h"
 #include "sysbus.h"

hw/ppc405_boards.c

@@ -27,7 +27,7 @@
 #include "nvram.h"
 #include "flash.h"
 #include "sysemu.h"
-#include "block.h"
+#include "block/block.h"
 #include "boards.h"
 #include "qemu-log.h"
 #include "loader.h"

hw/s390-virtio-bus.c

@@ -18,7 +18,7 @@
  */
 
 #include "hw.h"
-#include "block.h"
+#include "block/block.h"
 #include "sysemu.h"
 #include "boards.h"
 #include "monitor.h"

hw/s390-virtio.c

@@ -18,7 +18,7 @@
  */
 
 #include "hw.h"
-#include "block.h"
+#include "block/block.h"
 #include "blockdev.h"
 #include "sysemu.h"
 #include "net/net.h"

hw/scsi.h

@@ -2,7 +2,7 @@
 #define QEMU_HW_SCSI_H
 
 #include "qdev.h"
-#include "block.h"
+#include "block/block.h"
 #include "hw/block-common.h"
 #include "sysemu.h"
 

hw/sd.c

@@ -30,7 +30,7 @@
  */
 
 #include "hw.h"
-#include "block.h"
+#include "block/block.h"
 #include "sd.h"
 #include "bitmap.h"
 

hw/spitz.c

@@ -22,7 +22,7 @@
 #include "devices.h"
 #include "sharpsl.h"
 #include "ui/console.h"
-#include "block.h"
+#include "block/block.h"
 #include "audio/audio.h"
 #include "boards.h"
 #include "blockdev.h"

hw/tosa.c

@@ -17,7 +17,7 @@
 #include "devices.h"
 #include "sharpsl.h"
 #include "pcmcia.h"
-#include "block.h"
+#include "block/block.h"
 #include "boards.h"
 #include "i2c.h"
 #include "ssi.h"

include/block/block.h

@@ -1,10 +1,10 @@
 #ifndef BLOCK_H
 #define BLOCK_H
 
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "qemu-common.h"
 #include "qemu-option.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi-types.h"
 

include/block/block_int.h

@@ -24,10 +24,10 @@
 #ifndef BLOCK_INT_H
 #define BLOCK_INT_H
 
-#include "block.h"
+#include "block/block.h"
 #include "qemu-option.h"
 #include "qemu-queue.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "qemu-timer.h"
 #include "qapi-types.h"
 #include "qapi/qmp/qerror.h"

include/block/blockjob.h

@@ -25,7 +25,7 @@
 #ifndef BLOCKJOB_H
 #define BLOCKJOB_H 1
 
-#include "block.h"
+#include "block/block.h"
 
 /**
  * BlockJobType:

include/block/coroutine_int.h

@@ -26,7 +26,7 @@
 #define QEMU_COROUTINE_INT_H
 
 #include "qemu-queue.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 
 typedef enum {
     COROUTINE_YIELD = 1,

include/block/thread-pool.h

@@ -21,8 +21,8 @@
 #include "qemu-common.h"
 #include "qemu-queue.h"
 #include "qemu-thread.h"
-#include "qemu-coroutine.h"
-#include "block_int.h"
+#include "block/coroutine.h"
+#include "block/block_int.h"
 
 typedef int ThreadPoolFunc(void *opaque);
 

iohandler.c

@@ -25,7 +25,7 @@
 #include "config-host.h"
 #include "qemu-common.h"
 #include "qemu-queue.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "main-loop.h"
 
 #ifndef _WIN32

main-loop.c

@@ -26,7 +26,7 @@
 #include "qemu-timer.h"
 #include "slirp/slirp.h"
 #include "main-loop.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 
 #ifndef _WIN32
 

main-loop.h

@@ -25,7 +25,7 @@
 #ifndef QEMU_MAIN_LOOP_H
 #define QEMU_MAIN_LOOP_H 1
 
-#include "qemu-aio.h"
+#include "block/aio.h"
 
 #define SIG_IPI SIGUSR1
 

migration-exec.c

@@ -19,7 +19,7 @@
 #include "qemu_socket.h"
 #include "migration.h"
 #include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 

migration-fd.c

@@ -18,7 +18,7 @@
 #include "migration.h"
 #include "monitor.h"
 #include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
 #include "qemu_socket.h"
 
 //#define DEBUG_MIGRATION_FD

migration-tcp.c

@@ -17,7 +17,7 @@
 #include "qemu_socket.h"
 #include "migration.h"
 #include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
 
 //#define DEBUG_MIGRATION_TCP
 

migration-unix.c

@@ -17,7 +17,7 @@
 #include "qemu_socket.h"
 #include "migration.h"
 #include "buffered_file.h"
-#include "block.h"
+#include "block/block.h"
 
 //#define DEBUG_MIGRATION_UNIX
 

migration.c

@@ -18,7 +18,7 @@
 #include "monitor.h"
 #include "buffered_file.h"
 #include "sysemu.h"
-#include "block.h"
+#include "block/block.h"
 #include "qemu_socket.h"
 #include "block-migration.h"
 #include "qmp-commands.h"

monitor.h

@@ -4,7 +4,7 @@
 #include "qemu-common.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qdict.h"
-#include "block.h"
+#include "block/block.h"
 #include "readline.h"
 
 extern Monitor *cur_mon;

nbd.c

@@ -16,10 +16,10 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "nbd.h"
-#include "block.h"
+#include "block/nbd.h"
+#include "block/block.h"
 
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 
 #include <errno.h>
 #include <string.h>

qemu-char.h

@@ -5,7 +5,7 @@
 #include "qemu-queue.h"
 #include "qemu-option.h"
 #include "qemu-config.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 #include "main-loop.h"

qemu-coroutine-io.c

@@ -24,7 +24,7 @@
  */
 #include "qemu-common.h"
 #include "qemu_socket.h"
-#include "qemu-coroutine.h"
+#include "block/coroutine.h"
 #include "iov.h"
 
 ssize_t coroutine_fn

qemu-coroutine-lock.c

@@ -23,10 +23,10 @@
  */
 
 #include "qemu-common.h"
-#include "qemu-coroutine.h"
-#include "qemu-coroutine-int.h"
+#include "block/coroutine.h"
+#include "block/coroutine_int.h"
 #include "qemu-queue.h"
-#include "qemu-aio.h"
+#include "block/aio.h"
 #include "trace.h"
 
 static QTAILQ_HEAD(, Coroutine) unlock_bh_queue =